From f82166578f17306d8ae16fdbc753de3e00d2a97d Mon Sep 17 00:00:00 2001 From: Jason Ekstrand <jason.ekstrand@intel.com> Date: Thu, 1 Sep 2016 19:52:38 -0700 Subject: intel/isl: Fix up asserts in calc_phys_level0_extent_sa The assertion that a format is uncompressed in the multisample layouts isn't quite right. What we really want to assert is that the format supports multisampling which is a bit more complicated query. We also want to assert that it has a block size of 1x1 since we do nothing with the block size in the phys_level0_sa assignment. Signed-off-by: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Chad Versace <chadversary@chromium.org> Reviewed-by: Nanley Chery <nanley.g.chery@intel.com> --- src/intel/isl/isl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/intel/isl') diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index b6e88ad03e6..18e94d3a92a 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -580,7 +580,8 @@ isl_calc_phys_level0_extent_sa(const struct isl_device *dev, case ISL_MSAA_LAYOUT_ARRAY: assert(info->depth == 1); assert(info->levels == 1); - assert(!isl_format_is_compressed(info->format)); + assert(isl_format_supports_multisampling(dev->info, info->format)); + assert(fmtl->bw == 1 && fmtl->bh == 1); *phys_level0_sa = (struct isl_extent4d) { .w = info->width, @@ -593,7 +594,8 @@ isl_calc_phys_level0_extent_sa(const struct isl_device *dev, case ISL_MSAA_LAYOUT_INTERLEAVED: assert(info->depth == 1); assert(info->levels == 1); - assert(!isl_format_is_compressed(info->format)); + assert(isl_format_supports_multisampling(dev->info, info->format)); + assert(fmtl->bw == 1 && fmtl->bh == 1); *phys_level0_sa = (struct isl_extent4d) { .w = info->width, -- cgit v1.2.3