Module: wine Branch: master Commit: 7fc2b67228e2f91b1d1a9e57883f5f7d44a20a2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fc2b67228e2f91b1d1a9e578...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Jun 26 15:24:20 2019 +0430
wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_material_uniform().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8778c61..3da8961 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1341,10 +1341,10 @@ static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_contex checkGLcall("glUniformMatrix4fv"); }
-static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
if (state->render_states[WINED3D_RS_SPECULARENABLE]) { @@ -1615,7 +1615,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context }
if (update_mask & WINED3D_SHADER_CONST_FFP_MATERIAL) - shader_glsl_ffp_vertex_material_uniform(context, state, prog); + shader_glsl_ffp_vertex_material_uniform(context_gl, state, prog);
if (update_mask & WINED3D_SHADER_CONST_FFP_LIGHTS) {