Add R8_UNORM to the external AHB memory tests
New Tests:
dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.r8_unorm
Components: Vulkan
Change-Id: I40a76b4b6112ae6d0b053cf3427e313a6894a873
diff --git a/android/cts/main/vk-master-2022-03-01/api.txt b/android/cts/main/vk-master-2022-03-01/api.txt
index 72f70f6..1505646 100644
--- a/android/cts/main/vk-master-2022-03-01/api.txt
+++ b/android/cts/main/vk-master-2022-03-01/api.txt
@@ -58739,6 +58739,7 @@
dEQP-VK.api.copy_and_blit.copy_commands2.depth_stencil_msaa_copy.array_to_array.d24_unorm_s8_uint_S_64_bit
dEQP-VK.api.copy_and_blit.copy_commands2.depth_stencil_msaa_copy.array_to_array.d24_unorm_s8_uint_S_64_bit_bind_offset
dEQP-VK.api.descriptor_pool.zero_pool_size_count
+dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.r8_unorm
dEQP-VK.api.pipeline.pipeline_layout.lifetime.destroy_after_compute_pipeline_construction
dEQP-VK.api.pipeline.pipeline_layout.lifetime.destroy_after_graphics_pipeline_construction
dEQP-VK.api.pipeline.pipeline_invalid_pointers_unused_structs.graphics
diff --git a/android/cts/main/vk-master/api.txt b/android/cts/main/vk-master/api.txt
index b1c5c59..39cfd39 100644
--- a/android/cts/main/vk-master/api.txt
+++ b/android/cts/main/vk-master/api.txt
@@ -226527,6 +226527,7 @@
dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.d32_sfloat
dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.d32_sfloat_s8_uint
dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.s8_uint
+dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.r8_unorm
dEQP-VK.api.external.memory.dma_buf.suballocated.device_only.import_twice
dEQP-VK.api.external.memory.dma_buf.suballocated.device_only.import_multiple_times
dEQP-VK.api.external.memory.dma_buf.suballocated.device_only.dup
diff --git a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
index b7843c6..46733b0 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
@@ -4625,6 +4625,7 @@
vk::VK_FORMAT_D32_SFLOAT,
vk::VK_FORMAT_D32_SFLOAT_S8_UINT,
vk::VK_FORMAT_S8_UINT,
+ vk::VK_FORMAT_R8_UNORM,
};
const size_t numOfAhbFormats = DE_LENGTH_OF_ARRAY(ahbFormats);
diff --git a/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp b/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
index d6d442b..8201a83 100644
--- a/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
+++ b/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
@@ -1585,6 +1585,35 @@
}
#endif // defined(BUILT_WITH_ANDROID_P_HARDWARE_BUFFER)
+
+#if defined(BUILT_WITH_ANDROID_T_HARDWARE_BUFFER)
+class AndroidHardwareBufferExternalApi33 : public AndroidHardwareBufferExternalApi28
+{
+public:
+
+ virtual deUint32 vkFormatToAhbFormat(vk::VkFormat vkFormat);
+
+ AndroidHardwareBufferExternalApi33() : AndroidHardwareBufferExternalApi28() {};
+ virtual ~AndroidHardwareBufferExternalApi33() {};
+
+private:
+ // Stop the compiler generating methods of copy the object
+ AndroidHardwareBufferExternalApi33(AndroidHardwareBufferExternalApi33 const& copy); // Not Implemented
+ AndroidHardwareBufferExternalApi33& operator=(AndroidHardwareBufferExternalApi33 const& copy); // Not Implemented
+};
+
+deUint32 AndroidHardwareBufferExternalApi33::vkFormatToAhbFormat(vk::VkFormat vkFormat)
+{
+ switch(vkFormat)
+ {
+ case vk::VK_FORMAT_R8_UNORM:
+ return AHARDWAREBUFFER_FORMAT_R8_UNORM;
+ default:
+ return AndroidHardwareBufferExternalApi28::vkFormatToAhbFormat(vkFormat);
+ }
+}
+
+#endif // defined(BUILT_WITH_ANDROID_T_HARDWARE_BUFFER)
#endif // defined(BUILT_WITH_ANDROID_HARDWARE_BUFFER)
#endif // (DE_OS == DE_OS_ANDROID)
diff --git a/external/vulkancts/mustpass/main/vk-default/api.txt b/external/vulkancts/mustpass/main/vk-default/api.txt
index 9eaafde..017d0f9 100644
--- a/external/vulkancts/mustpass/main/vk-default/api.txt
+++ b/external/vulkancts/mustpass/main/vk-default/api.txt
@@ -226526,6 +226526,7 @@
dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.d32_sfloat
dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.d32_sfloat_s8_uint
dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.s8_uint
+dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.r8_unorm
dEQP-VK.api.external.memory.dma_buf.suballocated.device_only.import_twice
dEQP-VK.api.external.memory.dma_buf.suballocated.device_only.import_multiple_times
dEQP-VK.api.external.memory.dma_buf.suballocated.device_only.dup
