From: Topi Pohjolainen <topi.pohjolainen@intel.com>
Date: Tue, 10 Jan 2017 08:52:32 +0000 (+0200)
Subject: i965/gen6: Remove dead code in hiz surface setup
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a8e89cd5392e87fb592e3fb4bce135c72060e6f4;p=mesa.git

i965/gen6: Remove dead code in hiz surface setup

In intel_hiz_miptree_buf_create() the miptree is unconditionally
created with MIPTREE_LAYOUT_FORCE_ALL_SLICE_AT_LOD.

Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/gen6_depth_state.c b/src/mesa/drivers/dri/i965/gen6_depth_state.c
index 20992d53290..dcee1f9b61e 100644
--- a/src/mesa/drivers/dri/i965/gen6_depth_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_depth_state.c
@@ -162,14 +162,13 @@ gen6_emit_depth_stencil_hiz(struct brw_context *brw,
       if (hiz) {
          assert(depth_mt);
          struct intel_mipmap_tree *hiz_mt = depth_mt->hiz_buf->mt;
-         uint32_t offset = 0;
 
-         if (hiz_mt->array_layout == GEN6_HIZ_STENCIL) {
-            offset = intel_miptree_get_aligned_offset(
-                        hiz_mt,
-                        hiz_mt->level[lod].level_x,
-                        hiz_mt->level[lod].level_y);
-         }
+         assert(hiz_mt->array_layout == GEN6_HIZ_STENCIL);
+
+         const uint32_t offset = intel_miptree_get_aligned_offset(
+                                    hiz_mt,
+                                    hiz_mt->level[lod].level_x,
+                                    hiz_mt->level[lod].level_y);
 
 	 BEGIN_BATCH(3);
 	 OUT_BATCH((_3DSTATE_HIER_DEPTH_BUFFER << 16) | (3 - 2));