lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-13 09:15:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unwrap objects before forwaring vkDebugMarkerSetObject*

Browse Source
This commit is contained in:
baldurk
2016-10-21 09:07:00 +01:00
parent 6655f9d789
commit a293c5fad8
1 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+53 -14
View File
@@ -1019,20 +1019,44 @@ bool WrappedVulkan::Serialise_SetShaderDebugPath(Serialiser *localSerialiser, Vk
VkResult WrappedVulkan::vkDebugMarkerSetObjectTagEXT(VkDevice device,
VkDebugMarkerObjectTagInfoEXT *pTagInfo)
{
if(pTagInfo && pTagInfo->tagName == RENDERDOC_ShaderDebugMagicValue_truncated &&
pTagInfo->objectType == VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT)
if(m_State >= WRITING && pTagInfo)
{
VkResourceRecord *record = GetObjRecord(pTagInfo->objectType, pTagInfo->object);
CACHE_THREAD_SERIALISER();
if(!record)
{
RDCERR("Unrecognised object %d %llu", pTagInfo->objectType, pTagInfo->object);
return VK_SUCCESS;
}
SCOPED_SERIALISE_CONTEXT(SET_SHADER_DEBUG_PATH);
Serialise_SetShaderDebugPath(localSerialiser, device, pTagInfo);
record->AddChunk(scope.Get());
}
else if(ObjDisp(device)->DebugMarkerSetObjectTagEXT)
{
return ObjDisp(device)->DebugMarkerSetObjectTagEXT(device, pTagInfo);
if(pTagInfo->tagName == RENDERDOC_ShaderDebugMagicValue_truncated &&
pTagInfo->objectType == VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT)
{
CACHE_THREAD_SERIALISER();
SCOPED_SERIALISE_CONTEXT(SET_SHADER_DEBUG_PATH);
Serialise_SetShaderDebugPath(localSerialiser, device, pTagInfo);
record->AddChunk(scope.Get());
}
else if(ObjDisp(device)->DebugMarkerSetObjectTagEXT)
{
VkDebugMarkerObjectTagInfoEXT unwrapped = *pTagInfo;
if(unwrapped.objectType == VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT ||
unwrapped.objectType == VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT ||
unwrapped.objectType == VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT)
{
WrappedVkDispRes *res = (WrappedVkDispRes *)record->Resource;
unwrapped.object = res->real.handle;
}
else
{
WrappedVkNonDispRes *res = (WrappedVkNonDispRes *)record->Resource;
unwrapped.object = res->real.handle;
}
return ObjDisp(device)->DebugMarkerSetObjectTagEXT(device, &unwrapped);
}
}
return VK_SUCCESS;
@@ -1060,10 +1084,7 @@ bool WrappedVulkan::Serialise_vkDebugMarkerSetObjectNameEXT(Serialiser *localSer
VkResult WrappedVulkan::vkDebugMarkerSetObjectNameEXT(VkDevice device,
VkDebugMarkerObjectNameInfoEXT *pNameInfo)
{
if(ObjDisp(device)->DebugMarkerSetObjectNameEXT)
ObjDisp(device)->DebugMarkerSetObjectNameEXT(device, pNameInfo);
if(m_State >= WRITING)
if(m_State >= WRITING && pNameInfo)
{
Chunk *chunk = NULL;
@@ -1075,6 +1096,24 @@ VkResult WrappedVulkan::vkDebugMarkerSetObjectNameEXT(VkDevice device,
return VK_SUCCESS;
}
VkDebugMarkerObjectNameInfoEXT unwrapped = *pNameInfo;
if(unwrapped.objectType == VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT ||
unwrapped.objectType == VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT ||
unwrapped.objectType == VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT)
{
WrappedVkDispRes *res = (WrappedVkDispRes *)record->Resource;
unwrapped.object = res->real.handle;
}
else
{
WrappedVkNonDispRes *res = (WrappedVkNonDispRes *)record->Resource;
unwrapped.object = res->real.handle;
}
if(ObjDisp(device)->DebugMarkerSetObjectNameEXT)
ObjDisp(device)->DebugMarkerSetObjectNameEXT(device, &unwrapped);
{
CACHE_THREAD_SERIALISER();