KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

isl: Assert some iris invariants in isl_surf_get_ccs_surf 

The only driver which calls isl_surf_get_ccs_surf with extra_aux != NULL
is iris and it always calls it with two aux surfaces and never calls it
for CCS twice.  We can turn those checks into asserts.

Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11479>
This commit is contained in:
Jason Ekstrand 2021-06-23 17:03:06 -05:00 committed by Marge Bot
parent 6fe82e6c1e
commit 2d2590a879
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/intel/isl/isl.c
View File

@ -2148,16 +2148,9 @@ isl_surf_get_ccs_surf(const struct isl_device *dev,
uint32_t row_pitch_B)
{
assert(aux_surf);
/* An uninitialized surface is needed to get a CCS surface. */
if (aux_surf->size_B > 0 &&
(extra_aux_surf == NULL || extra_aux_surf->size_B > 0)) {
return false;
}
/* A surface can't have two CCS surfaces. */
if (aux_surf->usage & ISL_SURF_USAGE_CCS_BIT)
return false;
if (aux_surf->size_B > 0)
assert(extra_aux_surf);
assert(!(aux_surf->usage & ISL_SURF_USAGE_CCS_BIT));
if (!isl_surf_supports_ccs(dev, surf))
return false;