Mesa (7.8): Use bit-wise not instead of logical not.

Ian Romanick idr at kemper.freedesktop.org
Thu Mar 18 22:40:05 UTC 2010


Module: Mesa
Branch: 7.8
Commit: fda5078324e0a940a2ddfdd1c63ffceb47c5a717
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fda5078324e0a940a2ddfdd1c63ffceb47c5a717

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Mar 18 15:35:05 2010 -0700

Use bit-wise not instead of logical not.

The assertion is checking that the low-order bits of offset are not
set.  It does this by anding the inverted offset mask with the
offset.  This is clearly intended to be a bit-wise "invert".

Fixes bug #25984.

---

 src/mesa/drivers/dri/i915/intel_tris.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index fb191fe..4b6d3b4 100644
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -251,7 +251,7 @@ void intel_flush_prim(struct intel_context *intel)
       BEGIN_BATCH(5);
       OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
 		I1_LOAD_S(0) | I1_LOAD_S(1) | 1);
-      assert((offset & !S0_VB_OFFSET_MASK) == 0);
+      assert((offset & ~S0_VB_OFFSET_MASK) == 0);
       OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0, offset);
       OUT_BATCH((intel->vertex_size << S1_VERTEX_WIDTH_SHIFT) |
 		(intel->vertex_size << S1_VERTEX_PITCH_SHIFT));




More information about the mesa-commit mailing list