From 2735b33638309a306257f13bec52389292cf8ab7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 25 Aug 2005 19:38:42 +0000
Subject: [PATCH] remove stray references to ctx->Depth.OcclusionTest

---
 src/mesa/drivers/dri/i915/i830_metaops.c | 3 +--
 src/mesa/drivers/dri/i915/intel_pixel.c  | 3 +--
 src/mesa/drivers/dri/mga/mgapixel.c      | 3 +--
 src/mesa/drivers/dri/r200/r200_pixel.c   | 3 +--
 src/mesa/drivers/dri/tdfx/tdfx_pixels.c  | 1 -
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/i830_metaops.c b/src/mesa/drivers/dri/i915/i830_metaops.c
index dd23837..e12ef88 100644
--- a/src/mesa/drivers/dri/i915/i830_metaops.c
+++ b/src/mesa/drivers/dri/i915/i830_metaops.c
@@ -624,8 +624,7 @@ i830TryTextureDrawPixels( GLcontext *ctx,
 	!ctx->Color.ColorMask[2] ||
 	!ctx->Color.ColorMask[3] ||
 	ctx->Color.ColorLogicOpEnabled ||
-	ctx->Texture._EnabledUnits ||
-	ctx->Depth.OcclusionTest) {
+	ctx->Texture._EnabledUnits) {
       fprintf(stderr, "%s: other tests failed\n", __FUNCTION__);
       return GL_FALSE;
    }
diff --git a/src/mesa/drivers/dri/i915/intel_pixel.c b/src/mesa/drivers/dri/i915/intel_pixel.c
index e56e46b..09eea50 100644
--- a/src/mesa/drivers/dri/i915/intel_pixel.c
+++ b/src/mesa/drivers/dri/i915/intel_pixel.c
@@ -86,8 +86,7 @@ check_color_per_fragment_ops( const GLcontext *ctx )
 		    !ctx->Color.ColorMask[2] ||
 		    !ctx->Color.ColorMask[3] ||
 		    ctx->Color.ColorLogicOpEnabled ||
-		    ctx->Texture._EnabledUnits ||
-		    ctx->Depth.OcclusionTest
+		    ctx->Texture._EnabledUnits
            ) &&
 	   ctx->Current.RasterPosValid);
    
diff --git a/src/mesa/drivers/dri/mga/mgapixel.c b/src/mesa/drivers/dri/mga/mgapixel.c
index 952b8d5..38577f0 100644
--- a/src/mesa/drivers/dri/mga/mgapixel.c
+++ b/src/mesa/drivers/dri/mga/mgapixel.c
@@ -140,8 +140,7 @@ check_color_per_fragment_ops( const GLcontext *ctx )
 		    !ctx->Color.ColorMask[2] ||
 		    !ctx->Color.ColorMask[3] ||
 		    ctx->Color.ColorLogicOpEnabled ||
-		    ctx->Texture._EnabledUnits ||
-		    ctx->Depth.OcclusionTest
+		    ctx->Texture._EnabledUnits
            ) &&
 	   ctx->Current.RasterPosValid &&
 	   ctx->Pixel.ZoomX == 1.0F &&
diff --git a/src/mesa/drivers/dri/r200/r200_pixel.c b/src/mesa/drivers/dri/r200/r200_pixel.c
index adc6a2a..ad3ec20 100644
--- a/src/mesa/drivers/dri/r200/r200_pixel.c
+++ b/src/mesa/drivers/dri/r200/r200_pixel.c
@@ -93,8 +93,7 @@ check_color_per_fragment_ops( const GLcontext *ctx )
 		    !ctx->Color.ColorMask[2] ||
 		    !ctx->Color.ColorMask[3] ||
 		    ctx->Color.ColorLogicOpEnabled ||
-		    ctx->Texture._EnabledUnits ||
-		    ctx->Depth.OcclusionTest
+		    ctx->Texture._EnabledUnits
            ) &&
 	   ctx->Current.RasterPosValid);
    
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_pixels.c b/src/mesa/drivers/dri/tdfx/tdfx_pixels.c
index 6592ecc..1a5a2b1 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_pixels.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_pixels.c
@@ -618,7 +618,6 @@ tdfx_drawpixels_R8G8B8A8(GLcontext * ctx, GLint x, GLint y,
        !ctx->Color.ColorMask[3] ||
        ctx->Color.ColorLogicOpEnabled ||
        ctx->Texture._EnabledUnits ||
-       ctx->Depth.OcclusionTest ||
        fxMesa->Fallback)       
    {
       _swrast_DrawPixels( ctx, x, y, width, height, format, type, 
-- 
2.7.4