[Mesa-dev] [PATCH 09/12] i965: Fix an unused variable warning in the release build.

Eric Anholt eric at anholt.net
Thu Apr 11 11:06:36 PDT 2013


I think this actually clarifies what's going on in the asserts a bit,
given how many regions we've got floating around.
---
 src/mesa/drivers/dri/i965/brw_misc_state.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c
index db6bc2d..953f6cd 100644
--- a/src/mesa/drivers/dri/i965/brw_misc_state.c
+++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
@@ -599,8 +599,6 @@ brw_emit_depthbuffer(struct brw_context *brw)
    }
 
    if (depth_irb) {
-      struct intel_region *region = depth_mt->region;
-
       /* When 3DSTATE_DEPTH_BUFFER.Separate_Stencil_Enable is set, then
        * 3DSTATE_DEPTH_BUFFER.Surface_Format is not permitted to be a packed
        * depthstencil format.
@@ -616,8 +614,8 @@ brw_emit_depthbuffer(struct brw_context *brw)
       /* Prior to Gen7, if using separate stencil, hiz must be enabled. */
       assert(intel->gen >= 7 || !separate_stencil || hiz);
 
-      assert(intel->gen < 6 || region->tiling == I915_TILING_Y);
-      assert(!hiz || region->tiling == I915_TILING_Y);
+      assert(intel->gen < 6 || depth_mt->region->tiling == I915_TILING_Y);
+      assert(!hiz || depth_mt->region->tiling == I915_TILING_Y);
 
       depthbuffer_format = brw_depthbuffer_format(brw);
       depth_surface_type = BRW_SURFACE_2D;
-- 
1.7.10.4



More information about the mesa-dev mailing list