Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_light_uniform ().
Alexandre Julliard
julliard at winehq.org
Wed Jun 26 16:15:41 CDT 2019
Module: wine
Branch: master
Commit: 68c665576bf95fd6333ee01158ad380e9ddff12e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=68c665576bf95fd6333ee01158ad380e9ddff12e
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jun 26 15:24:22 2019 +0430
wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_light_uniform().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 ac4c167..8faa421 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1374,12 +1374,12 @@ static void shader_glsl_ffp_vertex_lightambient_uniform(const struct wined3d_con
checkGLcall("glUniform3fv");
}
-static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context *context,
+static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context_gl *context_gl,
const struct wined3d_state *state, unsigned int light, const struct wined3d_light_info *light_info,
struct glsl_shader_prog_link *prog)
{
const struct wined3d_matrix *view = &state->transforms[WINED3D_TS_VIEW];
- const struct wined3d_gl_info *gl_info = context->gl_info;
+ const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
struct wined3d_vec4 vec4;
GL_EXTCALL(glUniform4fv(prog->vs.light_location[light].diffuse, 1, &light_info->OriginalParms.diffuse.r));
@@ -1681,7 +1681,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
FIXME("Unhandled light type %#x.\n", light_info->OriginalParms.type);
continue;
}
- shader_glsl_ffp_vertex_light_uniform(context, state, idx, light_info, prog);
+ shader_glsl_ffp_vertex_light_uniform(context_gl, state, idx, light_info, prog);
}
}
More information about the wine-cvs
mailing list