Mesa (master): i965: Fix logic_op check.

Vinson Lee vlee at kemper.freedesktop.org
Sun Nov 3 22:47:41 UTC 2013


Module: Mesa
Branch: master
Commit: 68f1b274b06ed6f14cc8d069bee3cabc520fb553
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=68f1b274b06ed6f14cc8d069bee3cabc520fb553

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Sun Nov  3 14:43:53 2013 -0800

i965: Fix logic_op check.

Fixes "Macro compares unsigned to 0" defect reported by Coverity.

Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/drivers/dri/i965/intel_blit.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c
index b5857bb..0a03859 100644
--- a/src/mesa/drivers/dri/i965/intel_blit.c
+++ b/src/mesa/drivers/dri/i965/intel_blit.c
@@ -417,8 +417,7 @@ intelEmitImmediateColorExpandBlit(struct brw_context *brw,
 	 return false;
    }
 
-   assert( logic_op - GL_CLEAR >= 0 );
-   assert( logic_op - GL_CLEAR < 0x10 );
+   assert((logic_op >= GL_CLEAR) && (logic_op <= (GL_CLEAR + 0x0f)));
    assert(dst_pitch > 0);
 
    if (w < 0 || h < 0)




More information about the mesa-commit mailing list