wined3d: Fixup the write mask for gl_FogFragCoord and gl_PointSize.

gl_FogFragCoord and gl_PointSize are floats rather than vec4s in GLSL, so they shouldn't have a destination swizzle, and the write mask we return should consist of only the first component.

wined3d: Fixup the write mask for gl_FogFragCoord and gl_PointSize.
b28bd67f · H. Verbeet · Alexandre Julliard · 16cf4141 · b28bd67f
Commit b28bd67f authored Jan 15, 2007 by H. Verbeet Committed by Alexandre Julliard Jan 16, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 6 deletions

glsl_shader.c dlls/wined3d/glsl_shader.c +11 -6

No files found.
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -725,12 +725,17 @@ static DWORD shader_glsl_get_write_mask(const DWORD param, char *write_mask) {
    char *ptr = write_mask;
    DWORD mask = param & WINED3DSP_WRITEMASK_ALL;
-    if (mask != WINED3DSP_WRITEMASK_ALL) {
+    /* gl_FogFragCoord and glPointSize are floats, fixup the write mask. */
-        *ptr++ = '.';
+    if ((shader_get_regtype(param) == WINED3DSPR_RASTOUT) && ((param & WINED3DSP_REGNUM_MASK) != 0)) {
-        if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x';
+        mask = WINED3DSP_WRITEMASK_0;
-        if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y';
+    } else {
-        if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z';
+        if (mask != WINED3DSP_WRITEMASK_ALL) {
-        if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w';
+            *ptr++ = '.';
+            if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x';
+            if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y';
+            if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z';
+            if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w';
+        }
    }
    *ptr = '\0';