Vulkan: Split fragment shader from ColorAttachmentAndAllShadersRead

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -1487,13 +1487,6 @@ ANGLE_INLINE angle::Result ContextVk::handleDirtyTexturesImpl(
             // using specialized barriers without breaking the RenderPass.
             textureLayout = vk::ImageLayout::DepthStencilReadOnly;
         }
-        else if (image.hasRenderPassUseFlag(vk::RenderPassUsage::RenderTargetAttachment))
-        {
-            // Right now we set this flag only when RenderTargetAttachment is set since we do not
-            // track all textures in the renderpass.
-            image.setRenderPassUsageFlag(vk::RenderPassUsage::TextureSampler);
-            textureLayout = vk::ImageLayout::ColorAttachmentAndShaderRead;
-        }
         else
         {
             gl::ShaderBitSet remainingShaderBits =
@@ -1503,22 +1496,41 @@ ANGLE_INLINE angle::Result ContextVk::handleDirtyTexturesImpl(
             gl::ShaderType lastShader  = remainingShaderBits.last();
             remainingShaderBits.reset(firstShader);
             remainingShaderBits.reset(lastShader);
-            // We barrier against either:
-            // - Vertex only
-            // - Fragment only
-            // - Pre-fragment only (vertex, geometry and tessellation together)
-            if (remainingShaderBits.any() || firstShader != lastShader)
+
+            if (image.hasRenderPassUseFlag(vk::RenderPassUsage::RenderTargetAttachment))
             {
-                textureLayout = lastShader == gl::ShaderType::Fragment
-                                    ? vk::ImageLayout::AllGraphicsShadersReadOnly
-                                    : vk::ImageLayout::PreFragmentShadersReadOnly;
+                // Right now we set this flag only when RenderTargetAttachment is set since we do
+                // not track all textures in the renderpass.
+                image.setRenderPassUsageFlag(vk::RenderPassUsage::TextureSampler);
+
+                if (firstShader == gl::ShaderType::Fragment)
+                {
+                    textureLayout = vk::ImageLayout::ColorAttachmentAndFragmentShaderRead;
+                }
+                else
+                {
+                    textureLayout = vk::ImageLayout::ColorAttachmentAndAllShadersRead;
+                }
             }
             else
             {
-                textureLayout = kShaderReadOnlyImageLayouts[firstShader];
+                // We barrier against either:
+                // - Vertex only
+                // - Fragment only
+                // - Pre-fragment only (vertex, geometry and tessellation together)
+                if (remainingShaderBits.any() || firstShader != lastShader)
+                {
+                    textureLayout = lastShader == gl::ShaderType::Fragment
+                                        ? vk::ImageLayout::AllGraphicsShadersReadOnly
+                                        : vk::ImageLayout::PreFragmentShadersReadOnly;
+                }
+                else
+                {
+                    textureLayout = kShaderReadOnlyImageLayouts[firstShader];
+                }
             }
         }
-        // Ensure the image is in read-only layout
+        // Ensure the image is in the desired layout
         commandBufferHelper->imageRead(this, image.getAspectFlags(), textureLayout, &image);
 
         textureVk->retainImageViews(&mResourceUseList);

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -145,17 +145,33 @@ constexpr angle::PackedEnumMap<ImageLayout, ImageMemoryBarrierData> kImageMemory
         },
     },
     {
-        ImageLayout::ColorAttachmentAndShaderRead,
+        ImageLayout::ColorAttachmentAndFragmentShaderRead,
         ImageMemoryBarrierData{
-            "ColorAttachmentAndShaderRead",
+            "ColorAttachmentAndFragmentShaderRead",
             VK_IMAGE_LAYOUT_GENERAL,
-            VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | kAllShadersPipelineStageFlags,
-            VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | kAllShadersPipelineStageFlags,
+            VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+            VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
             // Transition to: all reads and writes must happen after barrier.
             VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_SHADER_READ_BIT,
             // Transition from: all writes must finish before barrier.
             VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
             ResourceAccess::Write,
+            PipelineStage::FragmentShader,
+        },
+    },
+    {
+        ImageLayout::ColorAttachmentAndAllShadersRead,
+        ImageMemoryBarrierData{
+            "ColorAttachmentAndAllShadersRead",
+            VK_IMAGE_LAYOUT_GENERAL,
+            VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | kAllShadersPipelineStageFlags,
+            VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | kAllShadersPipelineStageFlags,
+            // Transition to: all reads must happen after barrier.
+            VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_SHADER_READ_BIT,
+            // Transition from: RAR and WAR don't need memory barrier.
+            VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
+            ResourceAccess::Write,
+            // In case of multiple destination stages, We barrier the earliest stage
             PipelineStage::VertexShader,
         },
     },
@@ -1239,7 +1255,8 @@ void CommandBufferHelper::finalizeColorImageLayout(Context *context,
     {
         // texture code already picked layout and inserted barrier
         imageLayout = image->getCurrentImageLayout();
-        ASSERT(imageLayout == ImageLayout::ColorAttachmentAndShaderRead);
+        ASSERT(imageLayout == ImageLayout::ColorAttachmentAndFragmentShaderRead ||
+               imageLayout == ImageLayout::ColorAttachmentAndAllShadersRead);
     }
     else
     {

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -1348,7 +1348,8 @@ enum class ImageLayout
     // Framebuffer attachment layouts are placed first, so they can fit in fewer bits in
     // PackedAttachmentOpsDesc.
     ColorAttachment,
-    ColorAttachmentAndShaderRead,
+    ColorAttachmentAndFragmentShaderRead,
+    ColorAttachmentAndAllShadersRead,
     DepthStencilReadOnly,
     DepthStencilAttachment,
     DepthStencilResolveAttachment,