From: Nanley Chery Date: Wed, 18 May 2016 23:19:23 +0000 (-0700) Subject: isl: Handle npot ASTC block dimensions on Gen9+ X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a141576887b8bc6b7942c39aef22af0e57d95891;p=mesa.git isl: Handle npot ASTC block dimensions on Gen9+ Signed-off-by: Nanley Chery Reviewed-by: Jason Ekstrand --- 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, };