Module: wine Branch: master Commit: dfeee9077cd0965d1f7a804b4bb156c11fe7aaf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfeee9077cd0965d1f7a804b4b...
Author: Stefan Dösinger stefan@codeweavers.com Date: Wed Sep 11 11:31:17 2013 +0200
wined3d: Pass the swizzle map to find_vs_compile_args.
---
dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 05f7557..6ebd7fd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4584,7 +4584,7 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, int i; WORD int_skip;
- find_vs_compile_args(state, shader, &args->super); + find_vs_compile_args(state, shader, device->stream_info.swizzle_map, &args->super);
args->clip.boolclip_compare = 0; if (use_ps(state)) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 37661d3..0bd1180 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5807,7 +5807,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct vs_compile_args vs_compile_args; vshader = state->vertex_shader;
- find_vs_compile_args(state, vshader, &vs_compile_args); + find_vs_compile_args(state, vshader, device->stream_info.swizzle_map, &vs_compile_args); vs_id = find_glsl_vshader(context, &priv->shader_buffer, vshader, &vs_compile_args); vs_list = &vshader->linked_programs;
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2948aa9..3eee934 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1817,14 +1817,14 @@ HRESULT CDECL wined3d_shader_set_local_constants_float(struct wined3d_shader *sh return WINED3D_OK; }
-void find_vs_compile_args(const struct wined3d_state *state, - const struct wined3d_shader *shader, struct vs_compile_args *args) +void find_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, + WORD swizzle_map, struct vs_compile_args *args) { args->fog_src = state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE ? VS_FOG_COORD : VS_FOG_Z; args->clip_enabled = state->render_states[WINED3D_RS_CLIPPING] && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; - args->swizzle_map = shader->device->stream_info.swizzle_map; + args->swizzle_map = swizzle_map; }
static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_idx2) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6753ad3..9cabceb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2777,8 +2777,8 @@ void pixelshader_update_samplers(struct wined3d_shader *shader, WORD tex_types) void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct ps_compile_args *args) DECLSPEC_HIDDEN;
-void find_vs_compile_args(const struct wined3d_state *state, - const struct wined3d_shader *shader, struct vs_compile_args *args) DECLSPEC_HIDDEN; +void find_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, + WORD swizzle_map, struct vs_compile_args *args) DECLSPEC_HIDDEN;
void shader_buffer_clear(struct wined3d_shader_buffer *buffer) DECLSPEC_HIDDEN; BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) DECLSPEC_HIDDEN;