Module: wine Branch: master Commit: d86f6a4ab735d8aeab4964036d5cc72e5a1900a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86f6a4ab735d8aeab4964036...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Jul 3 16:37:03 2019 +0430
wined3d: Pass a wined3d_context_gl structure to shader_glsl_find_ffp_fragment_shader().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ed3ff54..88f1cae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9793,9 +9793,8 @@ static struct glsl_ffp_vertex_shader *shader_glsl_find_ffp_vertex_shader(struct }
static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(struct shader_glsl_priv *priv, - const struct ffp_frag_settings *args, const struct wined3d_context *context) + const struct ffp_frag_settings *args, const struct wined3d_context_gl *context_gl) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ffp_fragment_shader *glsl_desc; const struct ffp_frag_desc *desc;
@@ -10207,7 +10206,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct ffp_frag_settings settings;
gen_ffp_frag_op(context, state, &settings, FALSE); - ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context); + ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; }