mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-23 18:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

vulkan: Handle vkSetDebugUtilsObjectNameEXT on WSI objects

Browse Source 
Some WSI objects don't extend `vk_object_base` therefore they need
special handling.

Fixes: 3c87618d35 ("vulkan: Handle vkGet/SetPrivateDataEXT on Android swapchains")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24752>
This commit is contained in:
antonino 2023-08-17 15:09:15 +02:00 committed by Marge Bot
parent 5fe289d741
commit 76d150674b
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/vulkan/runtime/vk_debug_utils.c
View File

@ -153,12 +153,62 @@ vk_common_DestroyDebugUtilsMessengerEXT(
vk_free2(&instance->alloc, pAllocator, messenger); vk_free2(&instance->alloc, pAllocator, messenger);
} }
static VkResult
vk_common_set_object_name_locked(
struct vk_device *device,
const VkDebugUtilsObjectNameInfoEXT *pNameInfo)
{
if (unlikely(device->swapchain_name == NULL)) {
/* Even though VkSwapchain/Surface are non-dispatchable objects, we know
* a priori that these are actually pointers so we can use
* the pointer hash table for them.
*/
device->swapchain_name = _mesa_pointer_hash_table_create(NULL);
if (device->swapchain_name == NULL)
return VK_ERROR_OUT_OF_HOST_MEMORY;
}
char *object_name = vk_strdup(&device->alloc, pNameInfo->pObjectName,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (object_name == NULL)
return VK_ERROR_OUT_OF_HOST_MEMORY;
struct hash_entry *entry =
_mesa_hash_table_search(device->swapchain_name,
(void *)(uintptr_t)pNameInfo->objectHandle);
if (unlikely(entry == NULL)) {
entry = _mesa_hash_table_insert(device->swapchain_name,
(void *)(uintptr_t)pNameInfo->objectHandle,
object_name);
if (entry == NULL) {
vk_free(&device->alloc, object_name);
return VK_ERROR_OUT_OF_HOST_MEMORY;
}
} else {
vk_free(&device->alloc, entry->data);
entry->data = object_name;
}
return VK_SUCCESS;
}
VKAPI_ATTR VkResult VKAPI_CALL VKAPI_ATTR VkResult VKAPI_CALL
vk_common_SetDebugUtilsObjectNameEXT( vk_common_SetDebugUtilsObjectNameEXT(
VkDevice _device, VkDevice _device,
const VkDebugUtilsObjectNameInfoEXT *pNameInfo) const VkDebugUtilsObjectNameInfoEXT *pNameInfo)
{ {
VK_FROM_HANDLE(vk_device, device, _device); VK_FROM_HANDLE(vk_device, device, _device);
#ifdef ANDROID
if (pNameInfo->objectType == VK_OBJECT_TYPE_SWAPCHAIN_KHR ||
pNameInfo->objectType == VK_OBJECT_TYPE_SURFACE_KHR) {
#else
if (pNameInfo->objectType == VK_OBJECT_TYPE_SURFACE_KHR) {
#endif
mtx_lock(&device->swapchain_name_mtx);
VkResult res = vk_common_set_object_name_locked(device, pNameInfo);
mtx_unlock(&device->swapchain_name_mtx);
return res;
}
struct vk_object_base *object = struct vk_object_base *object =
vk_object_base_from_u64_handle(pNameInfo->objectHandle, vk_object_base_from_u64_handle(pNameInfo->objectHandle,
pNameInfo->objectType); pNameInfo->objectType);

2
src/vulkan/runtime/vk_device.h
View File

@ -258,6 +258,8 @@ struct vk_device {
mtx_t swapchain_private_mtx; mtx_t swapchain_private_mtx;
struct hash_table *swapchain_private; struct hash_table *swapchain_private;
mtx_t swapchain_name_mtx;
struct hash_table *swapchain_name;
}; };
VK_DEFINE_HANDLE_CASTS(vk_device, base, VkDevice, VK_DEFINE_HANDLE_CASTS(vk_device, base, VkDevice,