diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-04-29 13:16:09 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-04-29 13:16:09 +0000 |
| commit | 6b69d5f24d607121a503ab1781357d3e0aade677 (patch) | |
| tree | 04063cc9768ab1187d4b6ef87c4d26b0aa4cc966 | |
| parent | 49c973dbce3815e34eb7648d75d5d0f2240b817b (diff) | |
don't try to clear non-existant buffers
| -rw-r--r-- | src/mesa/main/buffers.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c index a6713c880d..8a84dc44fc 100644 --- a/src/mesa/main/buffers.c +++ b/src/mesa/main/buffers.c @@ -1,9 +1,8 @@ - /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 5.0.2 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -118,13 +117,19 @@ _mesa_Clear( GLbitfield mask ) if (!ctx->Depth.Mask) mask &= ~GL_DEPTH_BUFFER_BIT; - /* Build bitmask to send to driver Clear function */ - ddMask = mask & (GL_DEPTH_BUFFER_BIT | - GL_STENCIL_BUFFER_BIT | - GL_ACCUM_BUFFER_BIT); - if (mask & GL_COLOR_BUFFER_BIT) { + /* Build the bitmask to send to device driver's Clear function. + * Note that the GL_COLOR_BUFFER_BIT flag will expand to 0, 1, 2 or 4 + * of the FRONT/BACK_LEFT/RIGHT_BIT flags. + */ + ddMask = 0; + if (mask & GL_COLOR_BUFFER_BIT) ddMask |= ctx->Color._DrawDestMask; - } + if ((mask & GL_DEPTH_BUFFER_BIT) && ctx->Visual.depthBits > 0) + ddMask |= GL_DEPTH_BUFFER_BIT; + if ((mask & GL_STENCIL_BUFFER_BIT) && ctx->Visual.stencilBits > 0) + ddMask |= GL_STENCIL_BUFFER_BIT; + if ((mask & GL_ACCUM_BUFFER_BIT) && ctx->Visual.accumRedBits > 0) + ddMask |= GL_ACCUM_BUFFER_BIT; ASSERT(ctx->Driver.Clear); ctx->Driver.Clear( ctx, ddMask, (GLboolean) !ctx->Scissor.Enabled, |