Mesa (mesa_7_7_branch): i915: Use _MaxLevel on principle in texture setup.

Eric Anholt anholt at kemper.freedesktop.org
Mon Jan 4 22:18:37 UTC 2010


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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 29 15:55:34 2009 -0800

i915: Use _MaxLevel on principle in texture setup.

It was OK before because we proceed to clamp the value to hardware
limits, but given that other use of MaxLevel has been a trap, let's
avoid it.

---

 src/mesa/drivers/dri/i915/i915_texstate.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c
index de25848..825f1db 100644
--- a/src/mesa/drivers/dri/i915/i915_texstate.c
+++ b/src/mesa/drivers/dri/i915/i915_texstate.c
@@ -196,10 +196,11 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
 	 state[I915_TEXREG_MS3] |= MS3_TILE_WALK;
    }
 
-   /* We get one field with fraction bits to cover the maximum addressable (smallest
-    * resolution) LOD.  Use it to cover both MAX_LEVEL and MAX_LOD.
+   /* We get one field with fraction bits for the maximum addressable
+    * (lowest resolution) LOD.  Use it to cover both MAX_LEVEL and
+    * MAX_LOD.
     */
-   maxlod = MIN2(tObj->MaxLod, tObj->MaxLevel - tObj->BaseLevel);
+   maxlod = MIN2(tObj->MaxLod, tObj->_MaxLevel - tObj->BaseLevel);
    state[I915_TEXREG_MS4] =
       ((((pitch / 4) - 1) << MS4_PITCH_SHIFT) |
        MS4_CUBE_FACE_ENA_MASK |




More information about the mesa-commit mailing list