diff options
author | Joe Withers <joe.withers@imgtec.com> | 2023-08-31 11:18:40 +0100 |
---|---|---|
committer | Trevor Black <vantablack@google.com> | 2024-01-03 22:05:48 +0000 |
commit | 93763ac0ec0512d9ce98ac062bf73e37e61a80b6 (patch) | |
tree | 28118ce2c0f555f2aea29d912bc1bc3a957970a5 | |
parent | fba01251d6bbda257b18b637c5327a80ade2824d (diff) | |
download | deqp-93763ac0ec0512d9ce98ac062bf73e37e61a80b6.tar.gz |
Fix invalid memory index used in AHB import tests
When re-querying the memory index to match the memory type bits of the
AHB import, ensure that the returned memory index is host visible when
requested.
Components: Vulkan
VK-GL-CTS issue: 4644
Affects:
dEQP-VK.api.external.memory.android_hardware_buffer.*.import_twice
dEQP-VK.api.external.memory.android_hardware_buffer.*.import_multiple_times
Change-Id: Iea1b2eea0f622a0bae814f03ef6f22ec970f42df
-rw-r--r-- | external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp index 5ffe5ea42..6bbd7e124 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp @@ -3343,7 +3343,7 @@ tcu::TestStatus testMemoryImportTwice (Context& context, MemoryTestConfig config }; vkd.getAndroidHardwareBufferPropertiesANDROID(device.get(), handleA.getAndroidHardwareBuffer(), &ahbProperties); - exportedMemoryTypeIndex = chooseMemoryType(ahbProperties.memoryTypeBits); + exportedMemoryTypeIndex = getExportedMemoryTypeIndex(vki, physicalDevice, config.hostVisible, ahbProperties.memoryTypeBits); } { @@ -3413,7 +3413,7 @@ tcu::TestStatus testMemoryMultipleImports (Context& context, MemoryTestConfig co }; vkd.getAndroidHardwareBufferPropertiesANDROID(device.get(), handleA.getAndroidHardwareBuffer(), &ahbProperties); - exportedMemoryTypeIndex = chooseMemoryType(ahbProperties.memoryTypeBits); + exportedMemoryTypeIndex = getExportedMemoryTypeIndex(vki, physicalDevice, config.hostVisible, ahbProperties.memoryTypeBits); } for (size_t ndx = 0; ndx < count; ndx++) |