Module: Mesa Branch: main Commit: 37068e8aaf60a6d8239817b3186a7d7d41c6464e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=37068e8aaf60a6d8239817b3186a7d7d41c6464e
Author: Nanley Chery <[email protected]> Date: Thu Jul 13 10:08:42 2023 -0400 iris: Swap stencil and modifier aux assignment order Makes the next patch clearer. Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24120> --- src/gallium/drivers/iris/iris_resource.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 5251a2277a7..151cddf1281 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -871,10 +871,11 @@ iris_resource_configure_aux(struct iris_screen *screen, res->aux.usage = ISL_AUX_USAGE_HIZ_CCS; } } else if (has_ccs) { - if (res->mod_info) { - res->aux.usage = res->mod_info->aux_usage; - } else if (isl_surf_usage_is_stencil(res->surf.usage)) { + if (isl_surf_usage_is_stencil(res->surf.usage)) { + assert(!res->mod_info); res->aux.usage = ISL_AUX_USAGE_STC_CCS; + } else if (res->mod_info) { + res->aux.usage = res->mod_info->aux_usage; } else if (want_ccs_e_for_format(devinfo, res->surf.format)) { res->aux.usage = devinfo->ver < 12 ? ISL_AUX_USAGE_CCS_E : ISL_AUX_USAGE_FCV_CCS_E;
