diff options
author | Wim Taymans <wtaymans@redhat.com> | 2021-03-31 16:18:04 +0200 |
---|---|---|
committer | Wim Taymans <wtaymans@redhat.com> | 2021-04-06 12:32:57 +0200 |
commit | cefdd0d0f1d586506955aefa8808aa0fb6625d1d (patch) | |
tree | 30585f823370e0b4d9499a94a1c2659ffa8ec341 /sys | |
parent | 2ba5854c6bc76354ab2b764529dd5edcc18627b1 (diff) | |
download | gstreamer-plugins-bad-cefdd0d0f1d586506955aefa8808aa0fb6625d1d.tar.gz |
vulkan: provide a custom VK_DEFINE_NON_DISPATCHABLE_HANDLE
If the application did not define one yet, define our own
VK_DEFINE_NON_DISPATCHABLE_HANDLE that is independent of the
architecture.
Vulkan, by default, provides a define that depends on the architecture,
which causes the symbol type to be different. This causes an
architecture dependent .gir file, which then causes multilib
installation problems because the .gir files can't be shared.
Make it possible to override the format specifier and provide
a default one that is compatible with the default non dispatchable
handle.
Return VK_NULL_HANDLE from functions that return a non-dispatchable
handle.
Fixes #1566
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2130>
Diffstat (limited to 'sys')
-rw-r--r-- | sys/applemedia/videotexturecache-vulkan.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/applemedia/videotexturecache-vulkan.mm b/sys/applemedia/videotexturecache-vulkan.mm index ac0c1e712..6ea77d276 100644 --- a/sys/applemedia/videotexturecache-vulkan.mm +++ b/sys/applemedia/videotexturecache-vulkan.mm @@ -292,8 +292,8 @@ gst_io_surface_vulkan_memory_set_surface (GstIOSurfaceVulkanMemory * memory, texture_data->texture = (__bridge_retained gpointer) texture; VkResult err = vkSetMTLTextureMVK (memory->vulkan_mem.image, texture); - GST_DEBUG ("bound texture %p to image %p: 0x%x", texture, memory->vulkan_mem.image, - err); + GST_DEBUG ("bound texture %p to image %"GST_VULKAN_NON_DISPATCHABLE_HANDLE_FORMAT": 0x%x", + texture, memory->vulkan_mem.image, err); vk_mem->user_data = texture_data; vk_mem->notify = (GDestroyNotify) free_texture_wrapper; |