mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-19 13:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

aux/vk: Fix a place where we were missing an android ifdef

Browse source
This commit is contained in:
Ryan Pavlik 2020-09-24 15:38:21 -05:00
parent d4b19f3d47
commit 43d724b6bf
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xrt/auxiliary/vk/vk_helpers.c
View file

@ -316,10 +316,18 @@ vk_create_image_from_native(struct vk_bundle *vk,
VkImage image = VK_NULL_HANDLE; VkImage image = VK_NULL_HANDLE;
VkResult ret = VK_SUCCESS; VkResult ret = VK_SUCCESS;
#if defined(XRT_GRAPHICS_BUFFER_HANDLE_IS_FD)
VkExternalMemoryImageCreateInfoKHR external_memory_image_create_info = { VkExternalMemoryImageCreateInfoKHR external_memory_image_create_info = {
.sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHR, .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHR,
.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR, .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR,
}; };
#elif defined(XRT_GRAPHICS_BUFFER_HANDLE_IS_AHARDWAREBUFFER)
VkExternalMemoryImageCreateInfoKHR external_memory_image_create_info = {
.sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHR,
.handleTypes =
VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID,
};
#endif
VkImageCreateInfo vk_info = { VkImageCreateInfo vk_info = {
.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,