diff options
| author | Chad Versace <[email protected]> | 2011-10-10 15:02:22 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2011-10-15 15:49:03 -0700 |
| commit | 4bcda856982cc428cba555367001f4db721a9aaf (patch) | |
| tree | f25d67bf43636ba28561af025a27017d99dcc925 /src/mesa | |
| parent | 244a02c47d0de860db4183212f8a33c2c02d95db (diff) | |
swrast: Remove redundant term in logic expression
Fix is in {read,draw}_depth_stencil_pixels(). If depthRb == stencilRb,
then it is redundant to check depthRb->x *and* stencilRb->x.
Reviewed-by: Brian Paul <[email protected]>
Signed-off-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/swrast/s_drawpix.c | 1 | ||||
| -rw-r--r-- | src/mesa/swrast/s_readpix.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index 55b31df5dd3..6535a8f4350 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -590,7 +590,6 @@ draw_depth_stencil_pixels(struct gl_context *ctx, GLint x, GLint y, ASSERT(stencilRb); if (depthRb->_BaseFormat == GL_DEPTH_STENCIL_EXT && - stencilRb->_BaseFormat == GL_DEPTH_STENCIL_EXT && depthRb->Format == MESA_FORMAT_Z24_S8 && type == GL_UNSIGNED_INT_24_8 && depthRb == stencilRb && diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index 0f1f0ff58f6..d120468c021 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -391,7 +391,6 @@ read_depth_stencil_pixels(struct gl_context *ctx, stencilRb = ctx->ReadBuffer->Attachment[BUFFER_STENCIL].Renderbuffer; if (depthRb->_BaseFormat == GL_DEPTH_STENCIL_EXT && - stencilRb->_BaseFormat == GL_DEPTH_STENCIL_EXT && depthRb->Format == MESA_FORMAT_Z24_S8 && type == GL_UNSIGNED_INT_24_8 && depthRb == stencilRb && |