summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNanley Chery <[email protected]>2016-05-18 16:19:23 -0700
committerNanley Chery <[email protected]>2016-05-20 09:27:11 -0700
commita141576887b8bc6b7942c39aef22af0e57d95891 (patch)
tree4ab9a25b11f37aff5b6d011fd109b6ec1efc43b8
parentde86fb875d6627547b9823e830ec751b0f7ce42a (diff)
isl: Handle npot ASTC block dimensions on Gen9+
Signed-off-by: Nanley Chery <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]>
-rw-r--r--src/intel/isl/isl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index ca2db845a29..e4bca1689cf 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,
};