isl: assert on gfx7 condition that should not be met

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14039>
This commit is contained in:
Lionel Landwerlin 2022-07-21 15:52:19 +03:00 committed by Marge Bot
parent 4616aa2fac
commit 31cc7a1887

View file

@ -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:
*