Module: Mesa Branch: main Commit: 681871ade1780a8965d26bc270749fcf7ddc9658 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=681871ade1780a8965d26bc270749fcf7ddc9658
Author: Friedrich Vock <[email protected]> Date: Wed Jan 11 18:19:19 2023 +0100 radv/rmv: Fix resource ids for name tokens Fixes: 5611ab25 ("radv: Add RMV tracing layer") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20647> --- src/amd/vulkan/layers/radv_rmv_layer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/layers/radv_rmv_layer.c b/src/amd/vulkan/layers/radv_rmv_layer.c index 6ecad7ebee6..593d2a88c41 100644 --- a/src/amd/vulkan/layers/radv_rmv_layer.c +++ b/src/amd/vulkan/layers/radv_rmv_layer.c @@ -125,13 +125,13 @@ rmv_SetDebugUtilsObjectNameEXT(VkDevice _device, const VkDebugUtilsObjectNameInf } strcpy(name_buf, pNameInfo->pObjectName); + simple_mtx_lock(&device->vk.memory_trace_data.token_mtx); struct vk_rmv_userdata_token token; token.name = name_buf; - token.resource_id = _mesa_hash_data(&pNameInfo->objectHandle, sizeof(uint64_t)); + token.resource_id = vk_rmv_get_resource_id_locked(&device->vk, pNameInfo->objectHandle); - simple_mtx_lock(&device->vk.memory_trace_data.token_mtx); vk_rmv_emit_token(&device->vk.memory_trace_data, VK_RMV_TOKEN_TYPE_USERDATA, &token); simple_mtx_unlock(&device->vk.memory_trace_data.token_mtx); return VK_SUCCESS; -} \ No newline at end of file +}
