Include a few more things in verbose command recording logs

This commit is contained in:
baldurk
2022-05-30 11:18:31 +01:00
parent e89cee8f09
commit 49df2e4446
2 changed files with 34 additions and 0 deletions
@@ -4811,6 +4811,16 @@ void WrappedVulkan::vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t
execRecord->bakedCommands->cmdInfo->boundDescSets.end());
record->cmdInfo->subcmds.push_back(execRecord);
if(Vulkan_Debug_VerboseCommandRecording())
{
RDCLOG("Execute command buffer %s (baked was %s) in %s (baked to %s)",
ToStr(execRecord->GetResourceID()).c_str(),
ToStr(execRecord->bakedCommands->GetResourceID()).c_str(),
ToStr(record->GetResourceID()).c_str(),
ToStr(record->bakedCommands ? record->bakedCommands->GetResourceID() : ResourceId())
.c_str());
}
ImageState::Merge(record->cmdInfo->imageStates,
execRecord->bakedCommands->cmdInfo->imageStates, GetImageTransitionInfo());
}
@@ -4884,6 +4894,14 @@ void WrappedVulkan::vkCmdDebugMarkerBeginEXT(VkCommandBuffer commandBuffer,
SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdDebugMarkerBeginEXT);
Serialise_vkCmdDebugMarkerBeginEXT(ser, commandBuffer, pMarker);
if(Vulkan_Debug_VerboseCommandRecording())
{
RDCLOG(
"Begin marker %s in %s (baked to %s)", pMarker->pMarkerName,
ToStr(record->GetResourceID()).c_str(),
ToStr(record->bakedCommands ? record->bakedCommands->GetResourceID() : ResourceId()).c_str());
}
record->AddChunk(scope.Get(&record->cmdInfo->alloc));
}
}
@@ -5881,6 +5899,14 @@ void WrappedVulkan::vkCmdBeginDebugUtilsLabelEXT(VkCommandBuffer commandBuffer,
SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdBeginDebugUtilsLabelEXT);
Serialise_vkCmdBeginDebugUtilsLabelEXT(ser, commandBuffer, pLabelInfo);
if(Vulkan_Debug_VerboseCommandRecording())
{
RDCLOG(
"End marker %s in %s (baked to %s)", pLabelInfo->pLabelName,
ToStr(record->GetResourceID()).c_str(),
ToStr(record->bakedCommands ? record->bakedCommands->GetResourceID() : ResourceId()).c_str());
}
record->AddChunk(scope.Get(&record->cmdInfo->alloc));
}
}
@@ -24,6 +24,9 @@
#include "../vk_core.h"
#include "../vk_rendertext.h"
#include "core/settings.h"
RDOC_EXTERN_CONFIG(bool, Vulkan_Debug_VerboseCommandRecording);
///////////////////////////////////////////////////////////////////////////////////////
// WSI extension
@@ -767,6 +770,11 @@ VkResult WrappedVulkan::vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR
{
AdvanceFrame();
if(Vulkan_Debug_VerboseCommandRecording())
{
RDCLOG("vkQueuePresentKHR() to queue %s", ToStr(GetResID(queue)).c_str());
}
rdcarray<VkSwapchainKHR> unwrappedSwaps;
rdcarray<VkSemaphore> unwrappedWaitSems;