From ca5c69d3dd5c4a5b98737eb906475940ce61dd07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 27 Sep 2022 23:40:50 +0200 Subject: [PATCH] Vulkan: Better debug names for RENDER passes. --- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 8 +++++++- GPU/Common/FramebufferManagerCommon.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index 05e2f947cc..428d66e2cc 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -559,7 +559,13 @@ void VulkanQueueRunner::RunSteps(std::vector &steps, FrameData &frame if (emitLabels) { VkDebugUtilsLabelEXT labelInfo{ VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT }; - labelInfo.pLabelName = step.tag; + char temp[128]; + if (step.stepType == VKRStepType::RENDER && step.render.framebuffer) { + snprintf(temp, sizeof(temp), "%s: %s", step.tag, step.render.framebuffer->Tag()); + labelInfo.pLabelName = temp; + } else { + labelInfo.pLabelName = step.tag; + } vkCmdBeginDebugUtilsLabelEXT(frameData.mainCmd, &labelInfo); } diff --git a/GPU/Common/FramebufferManagerCommon.cpp b/GPU/Common/FramebufferManagerCommon.cpp index 9a666f83f8..b4db88965a 100644 --- a/GPU/Common/FramebufferManagerCommon.cpp +++ b/GPU/Common/FramebufferManagerCommon.cpp @@ -964,7 +964,7 @@ void FramebufferManagerCommon::NotifyRenderFramebufferSwitched(VirtualFramebuffe if (useBufferedRendering_) { if (vfb->fbo) { shaderManager_->DirtyLastShader(); - draw_->BindFramebufferAsRenderTarget(vfb->fbo, { Draw::RPAction::KEEP, Draw::RPAction::KEEP, Draw::RPAction::KEEP }, "FramebufferSwitch"); + draw_->BindFramebufferAsRenderTarget(vfb->fbo, { Draw::RPAction::KEEP, Draw::RPAction::KEEP, Draw::RPAction::KEEP }, "FBSwitch"); } else { // This should only happen very briefly when toggling useBufferedRendering_. ResizeFramebufFBO(vfb, vfb->width, vfb->height, true);