From: Nanley Chery Date: Tue, 23 Jun 2020 17:23:12 +0000 (-0700) Subject: iris: Better determine map_would_stall for Z/S X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=efd439e0d648c90ae5854a0e83cd864836864e91;hp=2c30079628d180dbfb3504853ea675b78558725b iris: Better determine map_would_stall for Z/S Use iris_has_invalid_primary to determine if mapping a depth or stencil surface would lead to a stall due to resolving. Reviewed-by: Kenneth Graunke Part-of: --- diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index b358f0c1ec5..bfd79603ee8 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -1788,27 +1788,12 @@ iris_transfer_map(struct pipe_context *ctx, usage |= PIPE_TRANSFER_UNSYNCHRONIZED; } - bool need_resolve = false; - - if (resource->target != PIPE_BUFFER) { - bool need_hiz_resolve = iris_resource_level_has_hiz(res, level); - bool need_stencil_resolve = res->aux.usage == ISL_AUX_USAGE_STC_CCS; - - bool need_color_resolve = - (res->aux.usage == ISL_AUX_USAGE_CCS_D || - res->aux.usage == ISL_AUX_USAGE_CCS_E || - res->aux.usage == ISL_AUX_USAGE_GEN12_CCS_E) && - iris_has_invalid_primary(res, level, 1, box->z, box->depth); - - need_resolve = need_color_resolve || - need_hiz_resolve || - need_stencil_resolve; - } - bool map_would_stall = false; if (!(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) { - map_would_stall = need_resolve || resource_is_busy(ice, res); + map_would_stall = + resource_is_busy(ice, res) || + iris_has_invalid_primary(res, level, 1, box->z, box->depth); if (map_would_stall && (usage & PIPE_TRANSFER_DONTBLOCK) && (usage & PIPE_TRANSFER_MAP_DIRECTLY))