Module: wine Branch: master Commit: 17d159e3ca5be865252d48a9d634c9d03e4d10b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17d159e3ca5be865252d48a9d...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Jun 21 03:08:01 2019 +0430
wined3d: Pass a wined3d_context_gl structure to find_arb_pshader().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 82ef119..273c4f3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4227,11 +4227,11 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, }
/* Context activation is done by the caller. */ -static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_context *context, +static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_context_gl *context_gl, struct wined3d_shader *shader, const struct arb_ps_compile_args *args) { - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_device *device = shader->device; UINT i; DWORD new_size; @@ -4565,7 +4565,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context
TRACE("Using pixel shader %p.\n", ps); find_arb_ps_compile_args(state, context, ps, &compile_args); - compiled = find_arb_pshader(context, ps, &compile_args); + compiled = find_arb_pshader(context_gl, ps, &compile_args); priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled;