The open source OpenXR runtime
a/vk: Fix validation error on Android
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2233>
authored by
Rylie Pavlik
and committed by
Marge Bot
f30e5265
58369ec1
+7
+7
src/xrt/auxiliary/vk/vk_image_allocator.c
+7
src/xrt/auxiliary/vk/vk_image_allocator.c
···
13
13
14
14
#include "vk/vk_image_allocator.h"
15
15
16
+
#include <vulkan/vulkan_core.h>
16
17
#include <xrt/xrt_handles.h>
17
18
18
19
#ifdef XRT_OS_LINUX
···
239
240
.sharingMode = VK_SHARING_MODE_EXCLUSIVE,
240
241
.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED,
241
242
};
243
+
#if defined(XRT_GRAPHICS_BUFFER_HANDLE_IS_AHARDWAREBUFFER)
244
+
// VUID-VkImageCreateInfo-pNext-01974
245
+
if (format_android.externalFormat != 0) {
246
+
create_info.format = VK_FORMAT_UNDEFINED;
247
+
}
248
+
#endif
242
249
243
250
ret = vk->vkCreateImage(vk->device, &create_info, NULL, &image);
244
251
if (ret != VK_SUCCESS) {