diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-09-01 19:52:38 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-10-03 14:53:01 -0700 |
| commit | f82166578f17306d8ae16fdbc753de3e00d2a97d (patch) | |
| tree | 0c7e4155926423b5a321dcfcdd954d308c88751d | |
| parent | 5637f3f1202b46ff02c80e743dd84752a040685a (diff) | |
| download | external_mesa3d-f82166578f17306d8ae16fdbc753de3e00d2a97d.zip external_mesa3d-f82166578f17306d8ae16fdbc753de3e00d2a97d.tar.gz external_mesa3d-f82166578f17306d8ae16fdbc753de3e00d2a97d.tar.bz2 | |
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>
| -rw-r--r-- | src/intel/isl/isl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index b6e88ad..18e94d3 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, |