Mesa (master): i915: Fix logic_op check.
Vinson Lee
vlee at kemper.freedesktop.org
Sun Nov 3 22:47:41 UTC 2013
Module: Mesa
Branch: master
Commit: 9943b6612b875286ab183c17e6ba89e2eafc77ab
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9943b6612b875286ab183c17e6ba89e2eafc77ab
Author: Vinson Lee <vlee at freedesktop.org>
Date: Sun Nov 3 14:42:18 2013 -0800
i915: 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/i915/intel_blit.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/intel_blit.c b/src/mesa/drivers/dri/i915/intel_blit.c
index 7b59708..5147d8e 100644
--- a/src/mesa/drivers/dri/i915/intel_blit.c
+++ b/src/mesa/drivers/dri/i915/intel_blit.c
@@ -534,8 +534,7 @@ intelEmitImmediateColorExpandBlit(struct intel_context *intel,
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