diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-22 09:28:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-22 09:28:23 +0100 |
| commit | ecc59cb52ffe4a84fddae997bba64adad35d5e93 (patch) | |
| tree | 233c2cf0ea65dcf0b671f28e14b1fb083dac87e3 /mesalib/src/mesa/state_tracker/st_cb_clear.c | |
| parent | d19dd4c9cf37b7b691552c4f4dd873471e31ca68 (diff) | |
| parent | 6baac61e6ca9cd314e689dfe7f84771aad08c66e (diff) | |
| download | vcxsrv-ecc59cb52ffe4a84fddae997bba64adad35d5e93.tar.gz vcxsrv-ecc59cb52ffe4a84fddae997bba64adad35d5e93.tar.bz2 vcxsrv-ecc59cb52ffe4a84fddae997bba64adad35d5e93.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_clear.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_clear.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_clear.c b/mesalib/src/mesa/state_tracker/st_cb_clear.c index a8365a708..193583372 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_clear.c +++ b/mesalib/src/mesa/state_tracker/st_cb_clear.c @@ -388,10 +388,7 @@ check_clear_depth_stencil_with_quad(struct gl_context *ctx, struct gl_renderbuff GLboolean maskStencil = (ctx->Stencil.WriteMask[0] & stencilMax) != stencilMax; - assert(rb->Format == MESA_FORMAT_S8 || - rb->Format == MESA_FORMAT_Z24_S8 || - rb->Format == MESA_FORMAT_S8_Z24 || - rb->Format == MESA_FORMAT_Z32_FLOAT_X24S8); + assert(_mesa_get_format_bits(rb->Format, GL_STENCIL_BITS) > 0); if (ctx->Scissor.Enabled && (ctx->Scissor.X != 0 || @@ -444,10 +441,7 @@ check_clear_stencil_with_quad(struct gl_context *ctx, struct gl_renderbuffer *rb const GLboolean maskStencil = (ctx->Stencil.WriteMask[0] & stencilMax) != stencilMax; - assert(rb->Format == MESA_FORMAT_S8 || - rb->Format == MESA_FORMAT_Z24_S8 || - rb->Format == MESA_FORMAT_S8_Z24 || - rb->Format == MESA_FORMAT_Z32_FLOAT_X24S8); + assert(_mesa_get_format_bits(rb->Format, GL_STENCIL_BITS) > 0); if (maskStencil) return GL_TRUE; |