Module: Mesa Branch: main Commit: 9b3b7e509106976b131df85f0462df299a44c80f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b3b7e509106976b131df85f0462df299a44c80f
Author: Constantine Shablya <[email protected]> Date: Thu Feb 2 10:45:16 2023 +0200 anv: handle ATTACHMENT_OPTIMAL layout Closes: #8216 Reviewed-by: Lionel Landwerlin <[email protected]> Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21066> --- src/intel/vulkan/anv_image.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index c034c4e4c10..0cda5122586 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -2128,7 +2128,8 @@ anv_layout_to_aux_state(const struct intel_device_info * const devinfo, case ISL_AUX_USAGE_CCS_D: /* We only support clear in exactly one state */ - if (layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) { + if (layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL || + layout == VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL) { assert(aux_supported); assert(clear_supported); return ISL_AUX_STATE_PARTIAL_CLEAR; @@ -2272,7 +2273,8 @@ anv_layout_to_fast_clear_type(const struct intel_device_info * const devinfo, case ISL_AUX_STATE_COMPRESSED_CLEAR: if (aspect == VK_IMAGE_ASPECT_DEPTH_BIT) { return ANV_FAST_CLEAR_DEFAULT_VALUE; - } else if (layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) { + } else if (layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL || + layout == VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL) { /* The image might not support non zero fast clears when mutable. */ if (!image->planes[plane].can_non_zero_fast_clear) return ANV_FAST_CLEAR_DEFAULT_VALUE;
