wined3d: Properly handle scalar destinations in shader_glsl_conditional_move().

In particular, we modify dst.write_mask in the code further down in order to mask out unused channels, but the writemask is ignored for scalar registers. Since all that code is redundant anyway for scalar destinations, we can just reuse the special case for scalar src0.

wined3d: Properly handle scalar destinations in shader_glsl_conditional_move().
eefe6346 · Henri Verbeet · Alexandre Julliard · acfdb0b0 · eefe6346
Commit eefe6346 authored Nov 26, 2012 by Henri Verbeet Committed by Alexandre Julliard Nov 27, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

glsl_shader.c dlls/wined3d/glsl_shader.c +1 -1

No files found.
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2878,7 +2878,7 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction
            break;
    }

-    if (shader_is_scalar(&ins->src[0].reg))
+    if (shader_is_scalar(&ins->dst[0].reg) || shader_is_scalar(&ins->src[0].reg))
    {
        write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins);
        shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param);