renderer_vulkan: missing depth barrier

src/video_core/renderer_vulkan/vk_rasterizer.cpp

@@ -152,7 +152,8 @@ void Rasterizer::BeginRendering() {
                                                           .stencil = regs.stencil_clear}},
         };
         texture_cache.TouchMeta(htile_address, false);
-        state.num_depth_attachments++;
+        state.has_depth = true;
+        state.has_stencil = image.info.usage.stencil;
     }
     scheduler.BeginRendering(state);
 }

src/video_core/renderer_vulkan/vk_scheduler.cpp

@@ -38,8 +38,7 @@ void Scheduler::BeginRendering(const RenderState& new_state) {
         .layerCount = 1,
         .colorAttachmentCount = render_state.num_color_attachments,
         .pColorAttachments = render_state.color_attachments.data(),
-        .pDepthAttachment =
+        .pDepthAttachment = render_state.has_depth ? &render_state.depth_attachment : nullptr,
-            render_state.num_depth_attachments ? &render_state.depth_attachment : nullptr,
     };
 
     current_cmdbuf.beginRendering(rendering_info);
@@ -50,6 +49,8 @@ void Scheduler::EndRendering() {
         return;
     }
     is_rendering = false;
+    current_cmdbuf.endRendering();
+
     boost::container::static_vector<vk::ImageMemoryBarrier, 9> barriers;
     for (size_t i = 0; i < render_state.num_color_attachments; ++i) {
         barriers.push_back(vk::ImageMemoryBarrier{
@@ -70,10 +71,35 @@ void Scheduler::EndRendering() {
                 },
         });
     }
-    current_cmdbuf.endRendering();
+    if (render_state.has_depth) {
+        barriers.push_back(vk::ImageMemoryBarrier{
+            .srcAccessMask = vk::AccessFlagBits::eDepthStencilAttachmentWrite,
+            .dstAccessMask = vk::AccessFlagBits::eShaderRead | vk::AccessFlagBits::eShaderWrite,
+            .oldLayout = render_state.depth_attachment.imageLayout,
+            .newLayout = render_state.depth_attachment.imageLayout,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .image = render_state.depth_image,
+            .subresourceRange =
+                {
+                    .aspectMask = vk::ImageAspectFlagBits::eDepth |
+                                  (render_state.has_stencil ? vk::ImageAspectFlagBits::eStencil
+                                                            : vk::ImageAspectFlagBits::eNone),
+                    .baseMipLevel = 0,
+                    .levelCount = VK_REMAINING_MIP_LEVELS,
+                    .baseArrayLayer = 0,
+                    .layerCount = VK_REMAINING_ARRAY_LAYERS,
+                },
+        });
+    }
+
     if (!barriers.empty()) {
-        current_cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eColorAttachmentOutput,
+        const auto src_stages =
-                                       vk::PipelineStageFlagBits::eFragmentShader,
+            vk::PipelineStageFlagBits::eColorAttachmentOutput |
+            (render_state.has_depth ? vk::PipelineStageFlagBits::eLateFragmentTests |
+                                          vk::PipelineStageFlagBits::eEarlyFragmentTests
+                                    : vk::PipelineStageFlagBits::eNone);
+        current_cmdbuf.pipelineBarrier(src_stages, vk::PipelineStageFlagBits::eFragmentShader,
                                        vk::DependencyFlagBits::eByRegion, {}, {}, barriers);
     }
 }

src/video_core/renderer_vulkan/vk_scheduler.h

@@ -20,7 +20,8 @@ struct RenderState {
     vk::RenderingAttachmentInfo depth_attachment{};
     vk::Image depth_image{};
     u32 num_color_attachments{};
-    u32 num_depth_attachments{};
+    bool has_depth{};
+    bool has_stencil{};
     u32 width = std::numeric_limits<u32>::max();
     u32 height = std::numeric_limits<u32>::max();
 

src/video_core/texture_cache/image_info.cpp

@@ -189,6 +189,8 @@ ImageInfo::ImageInfo(const AmdGpu::Liverpool::DepthBuffer& buffer, u32 num_slice
     resources.layers = num_slices;
     meta_info.htile_addr = buffer.z_info.tile_surface_en ? htile_address : 0;
     usage.depth_target = true;
+    usage.stencil =
+        buffer.stencil_info.format != AmdGpu::Liverpool::DepthBuffer::StencilFormat::Invalid;
 
     guest_address = buffer.Address();
     const auto depth_slice_sz = buffer.GetDepthSliceSize();