From dc70e2d55607faa39520e13d0d134e4f39df0b8c Mon Sep 17 00:00:00 2001 From: Jianxun Zhang Date: Tue, 1 Oct 2024 15:20:44 -0700 Subject: [PATCH] iris: Allow compression on multi-sampled stencil (xe2) Two aux functions are updated to fix piglit test once CCS is enabled on multi-sampled stencil resources in a following change. As reviewers suggested, we don't see much value of the assertion. https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31496#note_2601233 Piglit test: fbo-depthstencil blit default_fb -samples=16 -auto iris_resolve.c:972: iris_resource_get_aux_state: Assertion `res->surf.samples == 1 || res->surf.msaa_layout == ISL_MSAA_LAYOUT_ARRAY' failed. iris_resolve.c:996: iris_resource_set_aux_state: Assertion `res->surf.samples == 1 || res->surf.msaa_layout == ISL_MSAA_LAYOUT_ARRAY' failed. Signed-off-by: Jianxun Zhang Reviewed-by: Nanley Chery Part-of: --- src/gallium/drivers/iris/iris_resolve.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c index ec67cded1ea..e5ea8831a90 100644 --- a/src/gallium/drivers/iris/iris_resolve.c +++ b/src/gallium/drivers/iris/iris_resolve.c @@ -965,13 +965,7 @@ iris_resource_get_aux_state(const struct iris_resource *res, uint32_t level, uint32_t layer) { iris_resource_check_level_layer(res, level, layer); - - if (res->surf.usage & ISL_SURF_USAGE_DEPTH_BIT) { - assert(isl_aux_usage_has_hiz(res->aux.usage)); - } else { - assert(res->surf.samples == 1 || - res->surf.msaa_layout == ISL_MSAA_LAYOUT_ARRAY); - } + assert(res->aux.usage != ISL_AUX_USAGE_NONE); return res->aux.state[level][layer]; } @@ -991,8 +985,7 @@ iris_resource_set_aux_state(struct iris_context *ice, assert(iris_resource_level_has_hiz(devinfo, res, level) || !isl_aux_state_has_valid_aux(aux_state)); } else { - assert(res->surf.samples == 1 || - res->surf.msaa_layout == ISL_MSAA_LAYOUT_ARRAY); + assert(res->aux.usage != ISL_AUX_USAGE_NONE); } for (unsigned a = 0; a < num_layers; a++) {