Mesa (master): isl: Handle npot ASTC block dimensions on Gen9+

[Nanley Chery]

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

Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Wed May 18 16:19:23 2016 -0700

isl: Handle npot ASTC block dimensions on Gen9+

Signed-off-by: Nanley Chery <nanley.g.chery at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/intel/isl/isl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index ca2db84..e4bca16 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -481,8 +481,8 @@ isl_calc_phys_level0_extent_sa(const struct isl_device *dev,
          assert(info->samples == 1);
 
          *phys_level0_sa = (struct isl_extent4d) {
-            .w = isl_align(info->width, fmtl->bw),
-            .h = isl_align(info->height, fmtl->bh),
+            .w = isl_align_npot(info->width, fmtl->bw),
+            .h = isl_align_npot(info->height, fmtl->bh),
             .d = 1,
             .a = info->array_len,
          };
@@ -537,8 +537,8 @@ isl_calc_phys_level0_extent_sa(const struct isl_device *dev,
          assert(ISL_DEV_GEN(dev) >= 9);
 
          *phys_level0_sa = (struct isl_extent4d) {
-            .w = isl_align(info->width, fmtl->bw),
-            .h = isl_align(info->height, fmtl->bh),
+            .w = isl_align_npot(info->width, fmtl->bw),
+            .h = isl_align_npot(info->height, fmtl->bh),
             .d = 1,
             .a = info->depth,
          };