commit ef65d2a6a667fd61d131dd732a281a4ae6b3a702
author Jason Edmeades <us@the-edmeades.demon.co.uk> Fri Oct 31 00:09:07 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Oct 31 00:09:07 2003 +0000
tree 0f66e148b25e5824dbaaa7b4c5d651147e8c563c
parent 90f3057b41fb6afb24f4ca821cf8331624ff18d2

ColorWriteEnable should not impact clearing the screen.

dlls/d3d8/device.c

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 262ebbf..72b7541 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -1382,6 +1382,9 @@
                      ((Color >>  0) & 0xFF) / 255.0f, 
 		     ((Color >> 24) & 0xFF) / 255.0f);
         checkGLcall("glClearColor");
+
+        /* Clear ALL colors! */
+        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
         glMask = glMask | GL_COLOR_BUFFER_BIT;
     }
 
@@ -1426,6 +1429,10 @@
                      old_color_clear_value[1],
                      old_color_clear_value[2], 
                      old_color_clear_value[3]);
+        glColorMask(This->StateBlock->renderstate[D3DRS_COLORWRITEENABLE] & D3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE, 
+                    This->StateBlock->renderstate[D3DRS_COLORWRITEENABLE] & D3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE,
+                    This->StateBlock->renderstate[D3DRS_COLORWRITEENABLE] & D3DCOLORWRITEENABLE_BLUE  ? GL_TRUE : GL_FALSE, 
+                    This->StateBlock->renderstate[D3DRS_COLORWRITEENABLE] & D3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE);
     }
 
     glDisable(GL_SCISSOR_TEST);
@@ -2897,10 +2904,10 @@
 	      Value & D3DCOLORWRITEENABLE_GREEN ? 1 : 0,
 	      Value & D3DCOLORWRITEENABLE_BLUE  ? 1 : 0,
 	      Value & D3DCOLORWRITEENABLE_ALPHA ? 1 : 0); 
-	glColorMask(Value & D3DCOLORWRITEENABLE_RED, 
-                    Value & D3DCOLORWRITEENABLE_GREEN,
-		    Value & D3DCOLORWRITEENABLE_BLUE, 
-                    Value & D3DCOLORWRITEENABLE_ALPHA);
+        glColorMask(Value & D3DCOLORWRITEENABLE_RED   ? GL_TRUE : GL_FALSE, 
+                    Value & D3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE,
+                    Value & D3DCOLORWRITEENABLE_BLUE  ? GL_TRUE : GL_FALSE, 
+                    Value & D3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE);
         checkGLcall("glColorMask(...)");
 		break;