Fix generated RP barriers to specify no queue transfer explicitly

* For concurrent images this is required, and for shared images it's still valid.
dhcdht · Dec 2, 2021 · f8476b5 · f8476b5
1 parent d6ef7d5
commit f8476b5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/renderdoc/driver/vulkan/vk_image_states.cpp b/renderdoc/driver/vulkan/vk_image_states.cpp
@@ -1039,7 +1039,8 @@ void ImageState::RecordBarrier(VkImageMemoryBarrier barrier, uint32_t queueFamil
     if(!(barrier.srcQueueFamilyIndex == VK_QUEUE_FAMILY_IGNORED &&
          barrier.dstQueueFamilyIndex == VK_QUEUE_FAMILY_IGNORED))
     {
-      RDCWARN("Barrier contains invalid queue families for VK_SHARING_MODE_CONCURRENT");
+      RDCWARN("Barrier contains invalid queue families for VK_SHARING_MODE_CONCURRENT (%u %u)",
+              barrier.srcQueueFamilyIndex, barrier.dstQueueFamilyIndex);
     }
     barrier.srcQueueFamilyIndex = barrier.dstQueueFamilyIndex = queueFamilyIndex;
   }

diff --git a/renderdoc/driver/vulkan/vk_resources.cpp b/renderdoc/driver/vulkan/vk_resources.cpp
@@ -3308,6 +3308,8 @@ RenderPassInfo::RenderPassInfo(const VkRenderPassCreateInfo &ci)
     imageAttachments[i].barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
     imageAttachments[i].barrier.oldLayout = ci.pAttachments[i].initialLayout;
     imageAttachments[i].barrier.newLayout = ci.pAttachments[i].finalLayout;
+    imageAttachments[i].barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+    imageAttachments[i].barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
     imageAttachments[i].format = ci.pAttachments[i].format;
     imageAttachments[i].samples = ci.pAttachments[i].samples;
   }
@@ -3442,8 +3444,10 @@ RenderPassInfo::RenderPassInfo(const VkRenderPassCreateInfo2 &ci)
     imageAttachments[a].barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
     imageAttachments[a].barrier.oldLayout = ci.pAttachments[i].initialLayout;
     imageAttachments[a].barrier.newLayout = ci.pAttachments[i].finalLayout;
-    imageAttachments[i].format = ci.pAttachments[i].format;
-    imageAttachments[i].samples = ci.pAttachments[i].samples;
+    imageAttachments[a].barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+    imageAttachments[a].barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+    imageAttachments[a].format = ci.pAttachments[i].format;
+    imageAttachments[a].samples = ci.pAttachments[i].samples;
 
     indexRemapTable[i] = a;
 
@@ -3462,6 +3466,8 @@ RenderPassInfo::RenderPassInfo(const VkRenderPassCreateInfo2 &ci)
       imageAttachments[a].barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
       imageAttachments[a].barrier.oldLayout = separateStencil->stencilInitialLayout;
       imageAttachments[a].barrier.newLayout = separateStencil->stencilFinalLayout;
+      imageAttachments[a].barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+      imageAttachments[a].barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
       imageAttachments[a].barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT;
     }
   }