Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_arb_ps_compile_args().
Alexandre Julliard
julliard at winehq.org
Mon Jun 24 16:06:20 CDT 2019
Module: wine
Branch: master
Commit: 620bb8455186dfedcccb6c0bd652c00b728ada34
URL: https://source.winehq.org/git/wine.git/?a=commit;h=620bb8455186dfedcccb6c0bd652c00b728ada34
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Sat Jun 22 03:49:16 2019 +0430
wined3d: Pass a wined3d_context_gl structure to find_arb_ps_compile_args().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/arb_program_shader.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 273c4f3..7b06d64 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -4414,15 +4414,15 @@ static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *sh
}
static void find_arb_ps_compile_args(const struct wined3d_state *state,
- const struct wined3d_context *context, const struct wined3d_shader *shader,
+ const struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader,
struct arb_ps_compile_args *args)
{
- const struct wined3d_gl_info *gl_info = context->gl_info;
- const struct wined3d_d3d_info *d3d_info = context->d3d_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;
int i;
WORD int_skip;
- find_ps_compile_args(state, shader, context->stream_info.position_transformed, &args->super, context);
+ find_ps_compile_args(state, shader, context_gl->c.stream_info.position_transformed, &args->super, &context_gl->c);
/* This forces all local boolean constants to 1 to make them stateblock independent */
args->bools = shader->reg_maps.local_bool_consts;
@@ -4564,7 +4564,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context
struct arb_ps_compiled_shader *compiled;
TRACE("Using pixel shader %p.\n", ps);
- find_arb_ps_compile_args(state, context, ps, &compile_args);
+ find_arb_ps_compile_args(state, context_gl, ps, &compile_args);
compiled = find_arb_pshader(context_gl, ps, &compile_args);
priv->current_fprogram_id = compiled->prgId;
priv->compiled_fprog = compiled;
More information about the wine-cvs
mailing list