From 7f4f9279805876c6fd51608e77f47aad466a0b74 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Wed, 6 Nov 2024 11:07:47 +0100
Subject: [PATCH] [dxvk] Add command buffer parameter to debug label functions

---
 src/dxvk/dxvk_cmdlist.h   | 15 +++++++++------
 src/dxvk/dxvk_context.cpp | 22 +++++++++-------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/dxvk/dxvk_cmdlist.h b/src/dxvk/dxvk_cmdlist.h
index 96f826813..53b44f0ee 100644
--- a/src/dxvk/dxvk_cmdlist.h
+++ b/src/dxvk/dxvk_cmdlist.h
@@ -1048,25 +1048,28 @@ namespace dxvk {
     
 
     void cmdBeginDebugUtilsLabel(
-            VkDebugUtilsLabelEXT*   pLabelInfo) {
+            DxvkCmdBuffer           cmdBuffer,
+      const VkDebugUtilsLabelEXT&   labelInfo) {
       m_cmd.execCommands = true;
 
-      m_vki->vkCmdBeginDebugUtilsLabelEXT(getCmdBuffer(), pLabelInfo);
+      m_vki->vkCmdBeginDebugUtilsLabelEXT(getCmdBuffer(cmdBuffer), &labelInfo);
     }
 
 
-    void cmdEndDebugUtilsLabel() {
+    void cmdEndDebugUtilsLabel(
+            DxvkCmdBuffer           cmdBuffer) {
       m_cmd.execCommands = true;
 
-      m_vki->vkCmdEndDebugUtilsLabelEXT(getCmdBuffer());
+      m_vki->vkCmdEndDebugUtilsLabelEXT(getCmdBuffer(cmdBuffer));
     }
 
 
     void cmdInsertDebugUtilsLabel(
-            VkDebugUtilsLabelEXT*   pLabelInfo) {
+            DxvkCmdBuffer           cmdBuffer,
+      const VkDebugUtilsLabelEXT&   labelInfo) {
       m_cmd.execCommands = true;
 
-      m_vki->vkCmdInsertDebugUtilsLabelEXT(getCmdBuffer(), pLabelInfo);
+      m_vki->vkCmdInsertDebugUtilsLabelEXT(getCmdBuffer(cmdBuffer), &labelInfo);
     }
 
 
diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index 4523be383..9dc614b0e 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -2477,25 +2477,21 @@ namespace dxvk {
   }
 
 
-  void DxvkContext::beginDebugLabel(VkDebugUtilsLabelEXT *label) {
-    if (!m_device->instance()->extensions().extDebugUtils)
-      return;
-
-    m_cmd->cmdBeginDebugUtilsLabel(label);
+  void DxvkContext::beginDebugLabel(VkDebugUtilsLabelEXT* label) {
+    if (m_device->isDebugEnabled())
+      m_cmd->cmdBeginDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer, *label);
   }
 
+
   void DxvkContext::endDebugLabel() {
-    if (!m_device->instance()->extensions().extDebugUtils)
-      return;
-
-    m_cmd->cmdEndDebugUtilsLabel();
+    if (m_device->isDebugEnabled())
+      m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer);
   }
 
-  void DxvkContext::insertDebugLabel(VkDebugUtilsLabelEXT *label) {
-    if (!m_device->instance()->extensions().extDebugUtils)
-      return;
 
-    m_cmd->cmdInsertDebugUtilsLabel(label);
+  void DxvkContext::insertDebugLabel(VkDebugUtilsLabelEXT* label) {
+    if (m_device->isDebugEnabled())
+      m_cmd->cmdInsertDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer, *label);
   }