Module: Mesa Branch: mesa_7_7_branch Commit: d3a607f8893bfb0d31fe679c530db9743f14d15f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d3a607f8893bfb0d31fe679c530db9743f14d15f
Author: Ian Romanick <[email protected]> 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. (cherry picked from commit fda5078324e0a940a2ddfdd1c63ffceb47c5a717) --- 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 65db947..b1195da 100644 --- a/src/mesa/drivers/dri/i915/intel_tris.c +++ b/src/mesa/drivers/dri/i915/intel_tris.c @@ -254,7 +254,7 @@ void intel_flush_prim(struct intel_context *intel) BEGIN_BATCH(5, LOOP_CLIPRECTS); 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)); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
