From f7e021f7917e8e012b1140dfe2e18ded427b2802 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Thu, 17 Feb 2022 15:30:15 +0100
Subject: [PATCH] [dxvk] Add command buffer parameter to cmdFillBuffer

---
 src/dxvk/dxvk_cmdlist.h   | 5 ++++-
 src/dxvk/dxvk_context.cpp | 7 ++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dxvk/dxvk_cmdlist.h b/src/dxvk/dxvk_cmdlist.h
index acd526d7..434def24 100644
--- a/src/dxvk/dxvk_cmdlist.h
+++ b/src/dxvk/dxvk_cmdlist.h
@@ -599,11 +599,14 @@ namespace dxvk {
 
 
     void cmdFillBuffer(
+            DxvkCmdBuffer           cmdBuffer,
             VkBuffer                dstBuffer,
             VkDeviceSize            dstOffset,
             VkDeviceSize            size,
             uint32_t                data) {
-      m_vkd->vkCmdFillBuffer(m_execBuffer,
+      m_cmdBuffersUsed.set(cmdBuffer);
+
+      m_vkd->vkCmdFillBuffer(getCmdBuffer(cmdBuffer),
         dstBuffer, dstOffset, size, data);
     }
     
diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index fa0d1fb7..73b801c3 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -341,11 +341,8 @@ namespace dxvk {
     if (m_execBarriers.isBufferDirty(slice, DxvkAccess::Write))
       m_execBarriers.recordCommands(m_cmd);
     
-    m_cmd->cmdFillBuffer(
-      slice.handle,
-      slice.offset,
-      slice.length,
-      value);
+    m_cmd->cmdFillBuffer(DxvkCmdBuffer::ExecBuffer,
+      slice.handle, slice.offset, slice.length, value);
     
     m_execBarriers.accessBuffer(slice,
       VK_PIPELINE_STAGE_TRANSFER_BIT,