diff options
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r-- | src/mesa/drivers/dri/i915/i830_metaops.c | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_pixel.c | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/mga/mgapixel.c | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/r200/r200_pixel.c | 3 | ||||
-rw-r--r-- | 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 dd238378b00..e12ef88a742 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 e56e46b4d7f..09eea5022f0 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 952b8d56312..38577f05edd 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 adc6a2aa282..ad3ec20b4e9 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 6592ecccfba..1a5a2b11090 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, |