From: Elizabeth Figura zfigura@codeweavers.com
--- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/utils.c | 11 ++++------- dlls/wined3d/wined3d_private.h | 8 ++++---- 3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 78926739310..efe4c3016c2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10397,7 +10397,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, struct glsl_ffp_vertex_shader *ffp_shader; struct wined3d_ffp_vs_settings settings;
- wined3d_ffp_get_vs_settings(&context_gl->c, state, &settings); + wined3d_ffp_get_vs_settings(state, &context_gl->c.stream_info, d3d_info, &settings); ffp_shader = shader_glsl_find_ffp_vertex_shader(priv, gl_info, &settings); vs_id = ffp_shader->id; vs_list = &ffp_shader->linked_programs; @@ -10464,7 +10464,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, struct glsl_ffp_fragment_shader *ffp_shader; struct ffp_frag_settings settings;
- wined3d_ffp_get_fs_settings(&context_gl->c, state, &settings); + wined3d_ffp_get_fs_settings(state, d3d_info, &settings); ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 20e7fd05e2c..fb732929799 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6164,8 +6164,8 @@ void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *sr *dst = tmp; }
-void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, - const struct wined3d_state *state, struct ffp_frag_settings *settings) +void wined3d_ffp_get_fs_settings(const struct wined3d_state *state, + const struct wined3d_d3d_info *d3d_info, struct ffp_frag_settings *settings) { #define ARG1 0x01 #define ARG2 0x02 @@ -6203,7 +6203,6 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, unsigned int i; DWORD ttff; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; struct wined3d_texture *texture;
settings->padding = 0; @@ -6468,13 +6467,11 @@ int wined3d_ffp_frag_program_key_compare(const void *key, const struct wine_rb_e return memcmp(ka, kb, sizeof(*ka)); }
-void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, - const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings) +void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct wined3d_stream_info *si, + const struct wined3d_d3d_info *d3d_info, struct wined3d_ffp_vs_settings *settings) { enum wined3d_material_color_source diffuse_source, emissive_source, ambient_source, specular_source; const struct wined3d_vertex_declaration *vdecl = state->vertex_declaration; - const struct wined3d_stream_info *si = &context->stream_info; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; unsigned int coord_idx, i;
memset(settings, 0, sizeof(*settings)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 191894bf95a..6cc1daa7164 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2677,8 +2677,8 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb
extern const struct wined3d_parent_ops wined3d_null_parent_ops;
-void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, - const struct wined3d_state *state, struct ffp_frag_settings *settings); +void wined3d_ffp_get_fs_settings(const struct wined3d_state *state, + const struct wined3d_d3d_info *d3d_info, struct ffp_frag_settings *settings); const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings); void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc); @@ -2737,8 +2737,8 @@ struct wined3d_ffp_vs_desc struct wined3d_ffp_vs_settings settings; };
-void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, - const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings); +void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct wined3d_stream_info *si, + const struct wined3d_d3d_info *d3d_info, struct wined3d_ffp_vs_settings *settings);
struct wined3d {