| commit | a6aeac644e337188b5e0d6f4b79cbee16a75ab7b | [log] [tgz] |
|---|---|---|
| author | Yahan Zhou <yahan@google.com> | Tue Oct 24 00:39:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 24 00:39:24 2023 +0000 |
| tree | d647b37c71bf6470a24298fd06f64c425d8da900 | |
| parent | 87ec8883c223f32ba2841c37d331cadd2f6652f5 [diff] | |
| parent | 8d5f887abab10432a40f0c1af6c912198cb10d18 [diff] |
VkImageCreateInfo should ignore queeu family indices in some situation am: 8d5f887aba Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/25155736 Change-Id: I776ce7d409ba2be2e336fdaae2d73feebf394d76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp index 843dc04..d5ae1d3 100644 --- a/system/vulkan_enc/ResourceTracker.cpp +++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -4109,6 +4109,11 @@ VkEncoder* enc = (VkEncoder*)context; VkImageCreateInfo localCreateInfo = vk_make_orphan_copy(*pCreateInfo); + if (localCreateInfo.sharingMode != VK_SHARING_MODE_CONCURRENT) { + localCreateInfo.queueFamilyIndexCount = 0; + localCreateInfo.pQueueFamilyIndices = nullptr; + } + vk_struct_chain_iterator structChainIter = vk_make_chain_iterator(&localCreateInfo); VkExternalMemoryImageCreateInfo localExtImgCi;