From 4bcda856982cc428cba555367001f4db721a9aaf Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Mon, 10 Oct 2011 15:02:22 -0700 Subject: [PATCH] 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 Signed-off-by: Chad Versace --- src/mesa/swrast/s_drawpix.c | 1 - src/mesa/swrast/s_readpix.c | 1 - 2 files changed, 2 deletions(-) diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index 55b31df..6535a8f 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 0f1f0ff..d120468 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 && -- 2.7.4