OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iris: Allow compression on multi-sampled stencil (xe2)

Browse Source 
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 <jianxun.zhang@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31496>
This commit is contained in:
Jianxun Zhang
2024-10-01 15:20:44 -07:00
committed by Marge Bot
parent 705555b6b0
commit dc70e2d556
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gallium/drivers/iris/iris_resolve.c
View File

@@ -965,13 +965,7 @@ iris_resource_get_aux_state(const struct iris_resource *res,
uint32_t level, uint32_t layer) uint32_t level, uint32_t layer)
{ {
iris_resource_check_level_layer(res, level, layer); iris_resource_check_level_layer(res, level, layer);
assert(res->aux.usage != ISL_AUX_USAGE_NONE);
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);
}
return res->aux.state[level][layer]; 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) || assert(iris_resource_level_has_hiz(devinfo, res, level) ||
!isl_aux_state_has_valid_aux(aux_state)); !isl_aux_state_has_valid_aux(aux_state));
} else { } else {
assert(res->surf.samples == 1 || assert(res->aux.usage != ISL_AUX_USAGE_NONE);
res->surf.msaa_layout == ISL_MSAA_LAYOUT_ARRAY);
} }
for (unsigned a = 0; a < num_layers; a++) { for (unsigned a = 0; a < num_layers; a++) {