diff options
| -rw-r--r-- | src/mesa/main/drawpix.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/state.c | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c index 111bdf8b713..d8b35279439 100644 --- 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 d82ffa57448..5c3b316f89c 100644 --- 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 |