Mesa (master): hsw hiz: Add new size restrictions for miplevels > 0

[Jordan Justen]

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

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Tue Jul 16 00:01:05 2013 -0700

hsw hiz: Add new size restrictions for miplevels > 0

When performing hiz ops, we must ensure that the region sizes
have an 8 aligned width and 4 aligned height. We can tweak the
size for blorp hiz operations at LOD 0, but for the others we
can't. Therefore, we disable hiz for these miplevels if they
don't meet the size alignment requirements.

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Paul Berry <stereotype441 at gmail.com>

---

 src/mesa/drivers/dri/i965/intel_mipmap_tree.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 36a080f..d6988e0 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -1264,9 +1264,19 @@ intel_miptree_slice_enable_hiz(struct brw_context *brw,
        * stencil buffer tile size, 64x64 pixels, then
        * 3DSTATE_DEPTH_BUFFER.Depth_Coordinate_Offset_X/Y is set to 0.
        */
-      uint32_t depth_x_offset = mt->level[level].slice[layer].x_offset;
-      uint32_t depth_y_offset = mt->level[level].slice[layer].y_offset;
-      if ((depth_x_offset & 63) || (depth_y_offset & 63)) {
+      const struct intel_mipmap_level *l = &mt->level[level];
+      const struct intel_mipmap_slice *s = &l->slice[layer];
+      if ((s->x_offset & 63) || (s->y_offset & 63)) {
+         return false;
+      }
+
+      /* Disable HiZ for LOD > 0 unless the width is 8 aligned
+       * and the height is 4 aligned. This allows our HiZ support
+       * to fulfill Haswell restrictions for HiZ ops. For LOD == 0,
+       * we can grow the width & height to allow the HiZ op to
+       * force the proper size alignments.
+       */
+      if (level > 0 && ((l->width & 7) || (l->height & 3))) {
          return false;
       }
    }