iris,crocus: drop unnecessary DEBUG_NO_CCS/NO_HIZ checks

Now isl_surf_supports_ccs helper handles DEBUG_NO_CCS check and
isl_surf_get_hiz_surf handles DEBUG_NO_HIZ, so we don't
need to check it everywhere.

Signed-off-by: Sagar Ghuge <sagar.ghuge@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24731>
This commit is contained in:
Sagar Ghuge 2023-08-16 11:49:03 -07:00 committed by Marge Bot
parent 20db03d32f
commit 26b2bdcfe0
2 changed files with 3 additions and 4 deletions

View file

@ -432,11 +432,10 @@ crocus_resource_configure_aux(struct crocus_screen *screen,
isl_surf_get_mcs_surf(&screen->isl_dev, &res->surf, &res->aux.surf);
const bool has_hiz = devinfo->ver >= 6 && !res->mod_info &&
!INTEL_DEBUG(DEBUG_NO_HIZ) &&
isl_surf_get_hiz_surf(&screen->isl_dev, &res->surf, &res->aux.surf);
const bool has_ccs =
devinfo->ver >= 7 && !res->mod_info && !INTEL_DEBUG(DEBUG_NO_CCS) &&
devinfo->ver >= 7 && !res->mod_info &&
isl_surf_get_ccs_surf(&screen->isl_dev, &res->surf, NULL,
&res->aux.surf, 0);

View file

@ -840,10 +840,10 @@ iris_resource_configure_aux(struct iris_screen *screen,
const bool has_mcs =
isl_surf_get_mcs_surf(&screen->isl_dev, &res->surf, &res->aux.surf);
const bool has_hiz = !INTEL_DEBUG(DEBUG_NO_HIZ) &&
const bool has_hiz =
isl_surf_get_hiz_surf(&screen->isl_dev, &res->surf, &res->aux.surf);
const bool has_ccs = !INTEL_DEBUG(DEBUG_NO_CCS) &&
const bool has_ccs =
iris_get_ccs_surf_or_support(&screen->isl_dev, &res->surf,
&res->aux.surf, &res->aux.extra_aux.surf);