diff options
author | Philip Langdale <philipl@overt.org> | 2018-11-03 09:19:09 -0700 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2018-11-03 23:53:08 +0200 |
commit | c8a065df12f533c7efab4e3cc763bf63ef8cc11f (patch) | |
tree | 4cfda8b3b76624abec28359ec7dfaf6cc380c1e7 | |
parent | 880c59d1890286899a49be8c743f23889c42e137 (diff) | |
download | mpv-c8a065df12f533c7efab4e3cc763bf63ef8cc11f.tar.bz2 mpv-c8a065df12f533c7efab4e3cc763bf63ef8cc11f.tar.xz |
vo_gpu: vulkan: Always use KHR suffix types and defines
I was inconsistent about this originally, as the functionality was
moved into the core spec in 1.1 and so both suffixed and unsuffixed
versions of everything exist and can be mixed together.
There's no reason to fail to build with 1.0.39+ so I'm fixing the
names.
-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, }; |