aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-06-27 04:31:29 +0000
committerBrian Paul <[email protected]>2000-06-27 04:31:29 +0000
commit5f1eb35ee2be8cca48aab9a53a989c9a5ff73438 (patch)
tree3bd80088a284515b6b5e0f03e2d4fb6db3493b0c
parenta25f7e1d90afa2a824e653c54be8e8686579ec3b (diff)
fixed an assertion and minor bug
-rw-r--r--src/mesa/main/buffers.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 086dc93451b..566afed929a 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -151,10 +151,9 @@ clear_color_buffer(GLcontext *ctx)
const GLubyte a = (GLint) (ctx->Color.ClearColor[3] * 255.0F);
GLubyte span[MAX_WIDTH][4];
GLint i;
- ASSERT(ctx->Color.ColorMask[0] &&
- ctx->Color.ColorMask[1] &&
- ctx->Color.ColorMask[2] &&
- ctx->Color.ColorMask[3]);
+
+ ASSERT(!ctx->Color.SWmasking);
+
for (i = 0; i < width; i++) {
span[i][RCOMP] = r;
span[i][GCOMP] = g;
@@ -299,7 +298,7 @@ _mesa_Clear( GLbitfield mask )
/* clear software-based alpha buffer(s) */
if ( (mask & GL_COLOR_BUFFER_BIT)
&& ctx->DrawBuffer->UseSoftwareAlphaBuffers
- && ctx->Color.ColorMask[RCOMP]) {
+ && ctx->Color.ColorMask[ACOMP]) {
_mesa_clear_alpha_buffers( ctx );
}