fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 06:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan: Implement DebugMarkerSetObjectNameEXT

Browse source 
DebugMarkerSetObjectNameEXT is just a less powerful version of
SetDebugUtilsObjectNameEXT. Fixes the objectType cast warning as well.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27975>
This commit is contained in:
Konstantin Seurer 2024-03-05 10:15:08 +01:00 • committed by Marge Bot
parent d039764410
commit f3fe1f2f18
4 changed files with 44 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/amd/vulkan/layers/radv_rmv_layer.c
View file

@ -70,18 +70,6 @@ rmv_InvalidateMappedMemoryRanges(VkDevice _device, uint32_t memoryRangeCount, co
return VK_SUCCESS;
}
VKAPI_ATTR VkResult VKAPI_CALL
rmv_DebugMarkerSetObjectNameEXT(VkDevice device, const VkDebugMarkerObjectNameInfoEXT *pNameInfo)
{
assert(pNameInfo->sType == VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT);
VkDebugUtilsObjectNameInfoEXT name_info;
name_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT;
name_info.objectType = pNameInfo->objectType;
name_info.objectHandle = pNameInfo->object;
name_info.pObjectName = pNameInfo->pObjectName;
return rmv_SetDebugUtilsObjectNameEXT(device, &name_info);
}
VKAPI_ATTR VkResult VKAPI_CALL
rmv_SetDebugUtilsObjectNameEXT(VkDevice _device, const VkDebugUtilsObjectNameInfoEXT *pNameInfo)
{

7
src/amd/vulkan/layers/radv_sqtt_layer.c
View file

@ -1322,13 +1322,6 @@ sqtt_CmdDebugMarkerInsertEXT(VkCommandBuffer commandBuffer, const VkDebugMarkerM
radv_write_user_event_marker(cmd_buffer, UserEventTrigger, pMarkerInfo->pMarkerName);
}
VKAPI_ATTR VkResult VKAPI_CALL
sqtt_DebugMarkerSetObjectNameEXT(VkDevice device, const VkDebugMarkerObjectNameInfoEXT *pNameInfo)
{
/* no-op */
return VK_SUCCESS;
}
VKAPI_ATTR VkResult VKAPI_CALL
sqtt_DebugMarkerSetObjectTagEXT(VkDevice device, const VkDebugMarkerObjectTagInfoEXT *pTagInfo)
{

13
src/intel/vulkan/layers/anv_rmv_layer.c
View file

@ -76,19 +76,6 @@ VkResult anv_rmv_InvalidateMappedMemoryRanges(
return VK_SUCCESS;
}
VkResult anv_rmv_DebugMarkerSetObjectNameEXT(
VkDevice device,
const VkDebugMarkerObjectNameInfoEXT* pNameInfo)
{
assert(pNameInfo->sType == VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT);
VkDebugUtilsObjectNameInfoEXT name_info;
name_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT;
name_info.objectType = pNameInfo->objectType;
name_info.objectHandle = pNameInfo->object;
name_info.pObjectName = pNameInfo->pObjectName;
return anv_rmv_SetDebugUtilsObjectNameEXT(device, &name_info);
}
VkResult anv_rmv_SetDebugUtilsObjectNameEXT(
VkDevice _device,
const VkDebugUtilsObjectNameInfoEXT* pNameInfo)

44
src/vulkan/runtime/vk_debug_utils.c
View file

@ -190,6 +190,50 @@ vk_common_set_object_name_locked(
return VK_SUCCESS;
}
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_DebugMarkerSetObjectNameEXT(
VkDevice _device,
const VkDebugMarkerObjectNameInfoEXT *pNameInfo)
{
VK_FROM_HANDLE(vk_device, device, _device);
assert(pNameInfo->sType == VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT);
VkObjectType object_type;
switch (pNameInfo->objectType) {
case VK_DEBUG_REPORT_OBJECT_TYPE_SURFACE_KHR_EXT:
object_type = VK_OBJECT_TYPE_SURFACE_KHR;
break;
case VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT:
object_type = VK_OBJECT_TYPE_SWAPCHAIN_KHR;
break;
case VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT:
object_type = VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT;
break;
case VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_KHR_EXT:
object_type = VK_OBJECT_TYPE_DISPLAY_KHR;
break;
case VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_MODE_KHR_EXT:
object_type = VK_OBJECT_TYPE_DISPLAY_MODE_KHR;
break;
case VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT_EXT:
object_type = VK_OBJECT_TYPE_VALIDATION_CACHE_EXT;
break;
default:
object_type = (VkObjectType)pNameInfo->objectType;
break;
}
VkDebugUtilsObjectNameInfoEXT name_info = {
.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT,
.objectType = object_type,
.objectHandle = pNameInfo->object,
.pObjectName = pNameInfo->pObjectName,
};
return device->dispatch_table.SetDebugUtilsObjectNameEXT(_device, &name_info);
}
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_SetDebugUtilsObjectNameEXT(
VkDevice _device,