diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-04-13 21:27:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-13 21:27:51 +0000 |
| commit | 92e24d41ab510197c5ccb173f7b62593a7e6ae7b (patch) | |
| tree | 361dc5d80fc945b65d67d9989b8f3e4796995a60 | |
| parent | b918ad4a5ba6788c5a4cf84dba98e02f4474fead (diff) | |
| parent | eced1c6121155166b61e75a82c41d8cb7a1aed21 (diff) | |
| download | vulkan-cereal-92e24d41ab510197c5ccb173f7b62593a7e6ae7b.tar.gz | |
Merge "Allow IMAGE_ATTACHMENT usage with COLOR_ATTACHMENT format feature" am: eced1c6121
Original change: https://android-review.googlesource.com/c/device/generic/vulkan-cereal/+/2056953
Change-Id: If62f719ab45a34d2b127d6b1aae18fad727486bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | stream-servers/vulkan/VkCommonOperations.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/stream-servers/vulkan/VkCommonOperations.cpp b/stream-servers/vulkan/VkCommonOperations.cpp index 9e0fa055..8967cbfd 100644 --- a/stream-servers/vulkan/VkCommonOperations.cpp +++ b/stream-servers/vulkan/VkCommonOperations.cpp @@ -1540,11 +1540,16 @@ static std::unique_ptr<VkImageCreateInfo> generateColorBufferVkImageCreateInfo_l const VkFormatProperties& formatProperties = *maybeFormatProperties; constexpr std::pair<VkFormatFeatureFlags, VkImageUsageFlags> formatUsagePairs[] = { - {VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT}, - {VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT, VK_IMAGE_USAGE_SAMPLED_BIT}, - {VK_FORMAT_FEATURE_TRANSFER_SRC_BIT, VK_IMAGE_USAGE_TRANSFER_SRC_BIT}, - {VK_FORMAT_FEATURE_TRANSFER_DST_BIT, VK_IMAGE_USAGE_TRANSFER_DST_BIT}, - {VK_FORMAT_FEATURE_BLIT_SRC_BIT, VK_IMAGE_USAGE_TRANSFER_SRC_BIT}, + {VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT, + VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT|VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT}, + {VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT, + VK_IMAGE_USAGE_SAMPLED_BIT}, + {VK_FORMAT_FEATURE_TRANSFER_SRC_BIT, + VK_IMAGE_USAGE_TRANSFER_SRC_BIT}, + {VK_FORMAT_FEATURE_TRANSFER_DST_BIT, + VK_IMAGE_USAGE_TRANSFER_DST_BIT}, + {VK_FORMAT_FEATURE_BLIT_SRC_BIT, + VK_IMAGE_USAGE_TRANSFER_SRC_BIT}, }; VkFormatFeatureFlags tilingFeatures = (tiling == VK_IMAGE_TILING_OPTIMAL) ? formatProperties.optimalTilingFeatures |