Mesa (master): i915g: simplify math in constants emission

Jakob Bornecrantz wallbraker at kemper.freedesktop.org
Sat Feb 26 14:36:41 UTC 2011


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

Author: Daniel Vetter <daniel.vetter at ffwll.ch>
Date:   Fri Feb 25 18:03:16 2011 +0100

i915g: simplify math in constants emission

The old code even falls apart for nr == 0 (which is caught earlier, but)!

Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

---

 src/gallium/drivers/i915/i915_state_emit.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_state_emit.c b/src/gallium/drivers/i915/i915_state_emit.c
index 509d487..510fb1c 100644
--- a/src/gallium/drivers/i915/i915_state_emit.c
+++ b/src/gallium/drivers/i915/i915_state_emit.c
@@ -362,7 +362,7 @@ i915_emit_hardware_state(struct i915_context *i915 )
          uint i;
 
          OUT_BATCH( _3DSTATE_PIXEL_SHADER_CONSTANTS | (nr * 4) );
-         OUT_BATCH( (1 << (nr - 1)) | ((1 << (nr - 1)) - 1) );
+	 OUT_BATCH((1 << nr) - 1);
 
          for (i = 0; i < nr; i++) {
             const uint *c;




More information about the mesa-commit mailing list