changes for GL_HP_occlusion_test

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 111bdf8b713f86e0352b1ca736fc3ece1b36e349..d8b35279439bd4a48c6a601c353291ab9a9878a4 100644 (file)
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: drawpix.c,v 1.15 2000/03/21 01:03:40 brianp Exp $ */
+/* $Id: drawpix.c,v 1.16 2000/04/01 05:42:06 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -681,6 +681,8 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
       x = (GLint) (ctx->Current.RasterPos[0] + 0.5F);
       y = (GLint) (ctx->Current.RasterPos[1] + 0.5F);
 
+      ctx->OcclusionResult = GL_TRUE;
+
       /* see if device driver can do the drawpix */
       if (ctx->Driver.DrawPixels
           && (*ctx->Driver.DrawPixels)(ctx, x, y, width, height, format, type,

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index d82ffa574486828532c3d72da618450d92f68014..5c3b316f89cbc16260ba11a9724233b160d73bc0 100644 (file)
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.5 2000/03/11 23:23:26 brianp Exp $ */
+/* $Id: state.c,v 1.6 2000/04/01 05:42:06 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -791,16 +791,9 @@ static void update_rasterflags( GLcontext *ctx )
       ctx->RasterMask |= WINCLIP_BIT;
    }
 
-   if (ctx->Depth.OcclusionTest) {
-      if (ctx->Color.ColorMask[0] == 0 && 
-          ctx->Color.ColorMask[1] == 0 && 
-          ctx->Color.ColorMask[2] == 0 &&
-          ctx->Color.ColorMask[3] == 0 && 
-          ctx->Depth.Mask == GL_FALSE &&
-          !ctx->Stencil.Enabled) {
-         ctx->RasterMask |= OCCLUSION_BIT;
-      }
-   }
+   if (ctx->Depth.OcclusionTest)
+      ctx->RasterMask |= OCCLUSION_BIT;
+
 
    /* If we're not drawing to exactly one color buffer set the
     * MULTI_DRAW_BIT flag.  Also set it if we're drawing to no