diff options
| -rw-r--r-- | video/out/vulkan/malloc.c | 8 | ||||
| -rw-r--r-- | video/out/vulkan/ra_vk.c | 2 | ||||
| -rw-r--r-- | video/out/vulkan/utils.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/video/out/vulkan/malloc.c b/video/out/vulkan/malloc.c index a68a9342e5..e1e7ae28e6 100644 --- a/video/out/vulkan/malloc.c +++ b/video/out/vulkan/malloc.c @@ -136,9 +136,9 @@ static struct vk_slab *slab_alloc(struct mpvk_ctx *vk, struct vk_heap *heap, #if HAVE_WIN32_DESKTOP .handleTypes = IsWindows8OrGreater() ? VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR - : VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT, + : VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR, #else - .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT, + .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR, #endif }; @@ -158,8 +158,8 @@ static struct vk_slab *slab_alloc(struct mpvk_ctx *vk, struct vk_heap *heap, for (int i = 0; i < vk->num_pools; i++) qfs[i] = vk->pools[i]->qf; - VkExternalMemoryBufferCreateInfo ebinfo = { - .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO, + VkExternalMemoryBufferCreateInfoKHR ebinfo = { + .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR, .handleTypes = eminfo.handleTypes, }; diff --git a/video/out/vulkan/ra_vk.c b/video/out/vulkan/ra_vk.c index 80019fa4bc..0516664e79 100644 --- a/video/out/vulkan/ra_vk.c +++ b/video/out/vulkan/ra_vk.c @@ -951,7 +951,7 @@ static bool ra_vk_mem_get_external_info(struct ra *ra, struct vk_memslice *mem, .memory = mem->vkmem, .handleType = IsWindows8OrGreater() ? VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR - : VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT, + : VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR, }; VK_LOAD_PFN(vkGetMemoryWin32HandleKHR); diff --git a/video/out/vulkan/utils.c b/video/out/vulkan/utils.c index 1ad55d1275..e4bf58f514 100644 --- a/video/out/vulkan/utils.c +++ b/video/out/vulkan/utils.c @@ -333,12 +333,12 @@ bool mpvk_get_phys_device_uuid(struct mpvk_ctx *vk, uint8_t uuid_out[VK_UUID_SIZ { assert(vk->physd); - VkPhysicalDeviceIDProperties idprops = { - .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES, + VkPhysicalDeviceIDPropertiesKHR idprops = { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR, }; - VkPhysicalDeviceProperties2 props = { - .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2, + VkPhysicalDeviceProperties2KHR props = { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR, .pNext = &idprops, }; |