diff --git a/src/dxvk/dxvk_cmdlist.cpp b/src/dxvk/dxvk_cmdlist.cpp
index b60d8f75d..d60261ad1 100644
--- a/src/dxvk/dxvk_cmdlist.cpp
+++ b/src/dxvk/dxvk_cmdlist.cpp
@@ -125,7 +125,7 @@ namespace dxvk {
   VkCommandBuffer DxvkCommandPool::getCommandBuffer(DxvkCmdBuffer type) {
     auto vk = m_device->vkd();
 
-    if (m_next == m_commandBuffers.size()) {
+    if (m_nextPrimary == m_primaryBuffers.size()) {
       // Allocate a new command buffer and add it to the list
       VkCommandBufferAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO };
       allocInfo.commandPool = m_commandPool;
@@ -137,12 +137,12 @@ namespace dxvk {
       if (vk->vkAllocateCommandBuffers(vk->device(), &allocInfo, &commandBuffer))
         throw DxvkError("DxvkCommandPool: Failed to allocate command buffer");
 
-      m_commandBuffers.push_back(commandBuffer);
+      m_primaryBuffers.push_back(commandBuffer);
     }
 
     // Take existing command buffer. All command buffers
     // will be in reset state, so we can begin it safely.
-    VkCommandBuffer commandBuffer = m_commandBuffers[m_next++];
+    VkCommandBuffer commandBuffer = m_primaryBuffers[m_nextPrimary++];
 
     VkCommandBufferBeginInfo info = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
     info.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
@@ -172,14 +172,49 @@ namespace dxvk {
   }
 
 
+  VkCommandBuffer DxvkCommandPool::getSecondaryCommandBuffer(
+    const VkCommandBufferInheritanceInfo& inheritanceInfo) {
+    auto vk = m_device->vkd();
+
+    if (m_nextSecondary == m_secondaryBuffers.size()) {
+      // Allocate a new command buffer and add it to the list
+      VkCommandBufferAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO };
+      allocInfo.commandPool = m_commandPool;
+      allocInfo.level = VK_COMMAND_BUFFER_LEVEL_SECONDARY;
+      allocInfo.commandBufferCount = 1;
+
+      VkCommandBuffer commandBuffer = VK_NULL_HANDLE;
+
+      if (vk->vkAllocateCommandBuffers(vk->device(), &allocInfo, &commandBuffer))
+        throw DxvkError("DxvkCommandPool: Failed to allocate secondary command buffer");
+
+      m_secondaryBuffers.push_back(commandBuffer);
+    }
+
+    // Assume that the secondary command buffer contains only rendering commands
+    VkCommandBuffer commandBuffer = m_secondaryBuffers[m_nextSecondary++];
+
+    VkCommandBufferBeginInfo info = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
+    info.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
+               | VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT;
+    info.pInheritanceInfo = &inheritanceInfo;
+
+    if (vk->vkBeginCommandBuffer(commandBuffer, &info))
+      throw DxvkError("DxvkCommandPool: Failed to begin secondary command buffer");
+
+    return commandBuffer;
+  }
+
+
   void DxvkCommandPool::reset() {
     auto vk = m_device->vkd();
 
-    if (m_next) {
+    if (m_nextPrimary || m_nextSecondary) {
       if (vk->vkResetCommandPool(vk->device(), m_commandPool, 0))
         throw DxvkError("DxvkCommandPool: Failed to reset command pool");
 
-      m_next = 0;
+      m_nextPrimary = 0;
+      m_nextSecondary = 0;
     }
   }
 
diff --git a/src/dxvk/dxvk_cmdlist.h b/src/dxvk/dxvk_cmdlist.h
index 57ff7aa96..5a1bfe5ac 100644
--- a/src/dxvk/dxvk_cmdlist.h
+++ b/src/dxvk/dxvk_cmdlist.h
@@ -180,6 +180,15 @@ namespace dxvk {
      */
     VkCommandBuffer getCommandBuffer(DxvkCmdBuffer type);
 
+    /**
+     * \brief Retrieves or allocates secondary command buffer
+     *
+     * \param [in] inheritanceInfo Inheritance info
+     * \returns New command buffer in begun state
+     */
+    VkCommandBuffer getSecondaryCommandBuffer(
+      const VkCommandBufferInheritanceInfo& inheritanceInfo);
+
     /**
      * \brief Resets command pool and all command buffers
      */
@@ -190,8 +199,12 @@ namespace dxvk {
     DxvkDevice*                   m_device;
 
     VkCommandPool                 m_commandPool = VK_NULL_HANDLE;
-    std::vector<VkCommandBuffer>  m_commandBuffers;
-    size_t                        m_next        = 0;
+
+    std::vector<VkCommandBuffer>  m_primaryBuffers;
+    std::vector<VkCommandBuffer>  m_secondaryBuffers;
+
+    size_t                        m_nextPrimary   = 0u;
+    size_t                        m_nextSecondary = 0u;
 
   };