Mesa (main): vulkan: handle new VK_KHR_synchronization2 image layouts
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Oct 6 20:51:01 UTC 2021
Module: Mesa
Branch: main
Commit: 59e98694beadcc19590956bdac941cf3d7a23e96
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=59e98694beadcc19590956bdac941cf3d7a23e96
Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date: Wed Sep 22 10:42:47 2021 +0300
vulkan: handle new VK_KHR_synchronization2 image layouts
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9045>
---
src/vulkan/util/vk_image.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/vulkan/util/vk_image.c b/src/vulkan/util/vk_image.c
index 85e15803b8d..5e6db91dc07 100644
--- a/src/vulkan/util/vk_image.c
+++ b/src/vulkan/util/vk_image.c
@@ -468,6 +468,7 @@ vk_image_layout_is_read_only(VkImageLayout layout,
case VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR:
case VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL:
case VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL:
+ case VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR:
return false;
case VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL:
@@ -478,6 +479,7 @@ vk_image_layout_is_read_only(VkImageLayout layout,
case VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT:
case VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL:
case VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL:
+ case VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR:
return true;
case VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL:
@@ -487,8 +489,6 @@ vk_image_layout_is_read_only(VkImageLayout layout,
return aspect == VK_IMAGE_ASPECT_STENCIL_BIT;
case VK_IMAGE_LAYOUT_MAX_ENUM:
- case VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR:
- case VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR:
unreachable("Invalid image layout.");
}
@@ -596,9 +596,20 @@ vk_image_layout_to_usage_flags(VkImageLayout layout,
assert(aspect == VK_IMAGE_ASPECT_COLOR_BIT);
return VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT;
- case VK_IMAGE_LAYOUT_MAX_ENUM:
case VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR:
+ if (aspect == VK_IMAGE_ASPECT_DEPTH_BIT ||
+ aspect == VK_IMAGE_ASPECT_STENCIL_BIT) {
+ return VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
+ } else {
+ assert(aspect == VK_IMAGE_ASPECT_COLOR_BIT);
+ return VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+ }
+
case VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR:
+ return VK_IMAGE_USAGE_SAMPLED_BIT |
+ VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;
+
+ case VK_IMAGE_LAYOUT_MAX_ENUM:
unreachable("Invalid image layout.");
}
More information about the mesa-commit
mailing list