From: Xuelian Bai Date: Tue, 13 Jul 2021 02:38:23 +0000 (+0800) Subject: Support vkSetPrivateDataEXT/vkGetPrivateDataEXT X-Git-Tag: accepted/tizen/unified/20230227.042036~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47a2c381cc2527174ebc59a35a47c656d1e5fd63;p=platform%2Fupstream%2Fmesa.git Support vkSetPrivateDataEXT/vkGetPrivateDataEXT mesa assume that all object is created inside mesa, but for VK_OBJECT_TYPE_SWAPCHAIN_KHR type, when we use vulkan_wsi_layer, the object structure is different from mesa object, so don't use mesa original object logic. Change-Id: Iaea7f18e094b1bd1d2c7a4f4e7ecea0b81d9866a Signed-Off-by: Xuelian Bai --- diff --git a/src/vulkan/runtime/vk_device.h b/src/vulkan/runtime/vk_device.h index afbb4af..b023abf 100644 --- a/src/vulkan/runtime/vk_device.h +++ b/src/vulkan/runtime/vk_device.h @@ -242,7 +242,7 @@ struct vk_device { */ enum vk_queue_submit_mode submit_mode; -#ifdef ANDROID +#if defined(ANDROID) || defined(HAVE_TIZEN_PLATFORM) mtx_t swapchain_private_mtx; struct hash_table *swapchain_private; #endif diff --git a/src/vulkan/runtime/vk_object.c b/src/vulkan/runtime/vk_object.c index fb53ce6..ef7d538 100644 --- a/src/vulkan/runtime/vk_object.c +++ b/src/vulkan/runtime/vk_object.c @@ -168,7 +168,7 @@ vk_private_data_slot_destroy(struct vk_device *device, vk_free2(&device->alloc, pAllocator, slot); } -#ifdef ANDROID +#if defined(ANDROID) || defined(HAVE_TIZEN_PLATFORM) static VkResult get_swapchain_private_data_locked(struct vk_device *device, uint64_t objectHandle, @@ -216,7 +216,7 @@ vk_object_base_private_data(struct vk_device *device, { VK_FROM_HANDLE(vk_private_data_slot, slot, privateDataSlot); -#ifdef ANDROID +#if defined(ANDROID) || defined(HAVE_TIZEN_PLATFORM) /* There is an annoying spec corner here on Android. Because WSI is * implemented in the Vulkan loader which doesn't know about the * VK_EXT_private_data extension, we have to handle VkSwapchainKHR in the