lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 17:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use conservative order for image states updates (see d61f10d)

Browse Source
This commit is contained in:
baldurk
2022-10-03 12:04:46 +01:00
parent aec479700b
commit c237b70852
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
+7 -3
View File
@@ -883,8 +883,6 @@ void WrappedVulkan::CaptureQueueSubmit(VkQueue queue,
VkResourceRecord *record = GetRecord(commandBuffers[i]);
UpdateImageStates(record->bakedCommands->cmdInfo->imageStates);
if(Vulkan_Debug_VerboseCommandRecording())
{
RDCLOG("vkQueueSubmit() to queue %s, cmd %zu of %zu: %s baked to %s",
@@ -916,6 +914,7 @@ void WrappedVulkan::CaptureQueueSubmit(VkQueue queue,
// storage descriptors.
// record->bakedCommands->AddResourceReferences(GetResourceManager());
// GetResourceManager()->MergeReferencedMemory(record->bakedCommands->cmdInfo->memFrameRefs);
// UpdateImageStates(record->bakedCommands->cmdInfo->imageStates);
cmdsWithReferences.insert(record->bakedCommands);
record->bakedCommands->AddReferencedIDs(refdIDs);
@@ -933,10 +932,10 @@ void WrappedVulkan::CaptureQueueSubmit(VkQueue queue,
// above
// bakedSubcmds->AddResourceReferences(GetResourceManager());
// GetResourceManager()->MergeReferencedMemory(bakedSubcmds->cmdInfo->memFrameRefs);
// UpdateImageStates(bakedSubcmds->cmdInfo->imageStates);
cmdsWithReferences.insert(bakedSubcmds);
bakedSubcmds->AddReferencedIDs(refdIDs);
UpdateImageStates(bakedSubcmds->cmdInfo->imageStates);
GetResourceManager()->MarkResourceFrameReferenced(
subcmds[sub]->cmdInfo->allocRecord->GetResourceID(), eFrameRef_Read);
@@ -975,9 +974,13 @@ void WrappedVulkan::CaptureQueueSubmit(VkQueue queue,
VkResourceRecord *record = GetRecord(commandBuffers[i]);
record->bakedCommands->AddResourceReferences(GetResourceManager());
UpdateImageStates(record->bakedCommands->cmdInfo->imageStates);
for(VkResourceRecord *sub : record->bakedCommands->cmdInfo->subcmds)
{
sub->bakedCommands->AddResourceReferences(GetResourceManager());
UpdateImageStates(sub->bakedCommands->cmdInfo->imageStates);
}
}
// every 20 submits clean background references, in case the application isn't presenting.
@@ -1051,6 +1054,7 @@ void WrappedVulkan::CaptureQueueSubmit(VkQueue queue,
{
(*it)->AddResourceReferences(GetResourceManager());
GetResourceManager()->MergeReferencedMemory((*it)->cmdInfo->memFrameRefs);
UpdateImageStates((*it)->cmdInfo->imageStates);
}
GetResourceManager()->MarkResourceFrameReferenced(GetResID(queue), eFrameRef_Read);