Module: Mesa Branch: main Commit: 31cc7a1887678dbc8f250559d87b6aa8e4c69d2e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=31cc7a1887678dbc8f250559d87b6aa8e4c69d2e
Author: Lionel Landwerlin <[email protected]> Date: Thu Jul 21 15:52:19 2022 +0300 isl: assert on gfx7 condition that should not be met Signed-off-by: Lionel Landwerlin <[email protected]> Reviewed-by: Nanley Chery <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14039> --- src/intel/isl/isl_gfx7.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/intel/isl/isl_gfx7.c b/src/intel/isl/isl_gfx7.c index ee3bf268a91..4cfcf0ba843 100644 --- a/src/intel/isl/isl_gfx7.c +++ b/src/intel/isl/isl_gfx7.c @@ -62,6 +62,10 @@ isl_gfx7_choose_msaa_layout(const struct isl_device *dev, return true; } + /* Should have been filtered by isl_gfx6_filter_tiling() */ + assert(!isl_surf_usage_is_display(info->usage)); + assert(tiling != ISL_TILING_LINEAR); + if (!isl_format_supports_multisampling(dev->info, info->format)) return false; @@ -106,12 +110,6 @@ isl_gfx7_choose_msaa_layout(const struct isl_device *dev, if (info->samples > 1 && gfx7_format_needs_valign2(dev, info->format)) return false; - /* More obvious restrictions */ - if (isl_surf_usage_is_display(info->usage)) - return false; - if (tiling == ISL_TILING_LINEAR) - return false; - /* From the Ivybridge PRM, Volume 4 Part 1 p72, SURFACE_STATE, Multisampled * Surface Storage Format: *
