From: Topi Pohjolainen <topi.pohjolainen@intel.com>
Date: Thu, 29 Dec 2016 08:06:16 +0000 (+0200)
Subject: i965/gen6: Remove check for stencil format
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5201d2991b0a9e6d6a24bd9b0d07182bc14221bd;p=mesa.git

i965/gen6: Remove check for stencil format

There are is no alternative.

Reviewed-by: Samuel Iglesias Gons\341lvez <siglesias@igalia.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 3f14006f8a6..cb0ed253f9c 100644
--- a/src/mesa/drivers/dri/i965/gen6_depth_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_depth_state.c
@@ -191,20 +191,14 @@ gen6_emit_depth_stencil_hiz(struct brw_context *brw,
          uint32_t offset = 0;
 
          if (stencil_mt->array_layout == ALL_SLICES_AT_EACH_LOD) {
-            if (stencil_mt->format == MESA_FORMAT_S_UINT8) {
-               /* Note: we can't compute the stencil offset using
-                * intel_region_get_aligned_offset(), because stencil_region
-                * claims that the region is untiled even though it's W tiled.
-                */
-               offset =
-                  stencil_mt->level[lod].level_y * stencil_mt->pitch +
-                  stencil_mt->level[lod].level_x * 64;
-            } else {
-               offset = intel_miptree_get_aligned_offset(
-                           stencil_mt,
-                           stencil_mt->level[lod].level_x,
-                           stencil_mt->level[lod].level_y);
-            }
+            assert(stencil_mt->format == MESA_FORMAT_S_UINT8);
+
+            /* Note: we can't compute the stencil offset using
+             * intel_region_get_aligned_offset(), because stencil_region
+             * claims that the region is untiled even though it's W tiled.
+             */
+            offset = stencil_mt->level[lod].level_y * stencil_mt->pitch +
+                     stencil_mt->level[lod].level_x * 64;
          }
 
 	 BEGIN_BATCH(3);