VERY experimental Nintendo Switch 2 emulator
C++
Revert "[vk] Simplified layouts per driver configuration (#3271)" (#3571)
lizzieab129cf314f6
diff --git a/src/video_core/renderer_vulkan/blit_image.cpp b/src/video_core/renderer_vulkan/blit_image.cppindex 62c69c67b0..07611ef98c 100644--- a/src/video_core/renderer_vulkan/blit_image.cpp+++ b/src/video_core/renderer_vulkan/blit_image.cpp@@ -436,23 +436,7 @@ void TransitionImageLayout(vk::CommandBuffer& cmdbuf, VkImage image, VkImageLayo.layerCount = 1,},};- // Blit image barrier - transition can happen at any stage- // Using specific stages for better parallelism, but keeping broad since this is a general utility- const VkPipelineStageFlags src_stages_blit =- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- const VkPipelineStageFlags dst_stages_blit =- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages_blit, dst_stages_blit,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,0, barrier);}diff --git a/src/video_core/renderer_vulkan/present/util.cpp b/src/video_core/renderer_vulkan/present/util.cppindex c85af50060..29a1c34976 100644--- a/src/video_core/renderer_vulkan/present/util.cpp+++ b/src/video_core/renderer_vulkan/present/util.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project@@ -68,16 +68,7 @@ void TransitionImageLayout(vk::CommandBuffer& cmdbuf, VkImage image, VkImageLayo.layerCount = 1,},};- // Present path - use specific stages for better parallelism on tile-based GPUs- const VkPipelineStageFlags src_stages =- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- const VkPipelineStageFlags dst_stages =- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages, dst_stages,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,0, barrier);}@@ -160,12 +151,11 @@ void DownloadColorImage(vk::CommandBuffer& cmdbuf, VkImage image, VkBuffer buffe.layerCount = VK_REMAINING_ARRAY_LAYERS,},};- // Host will read the downloaded datastatic constexpr VkMemoryBarrier memory_write_barrier{.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,.pNext = nullptr,- .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,- .dstAccessMask = VK_ACCESS_HOST_READ_BIT,+ .srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,};const VkBufferImageCopy copy{.bufferOffset = 0,@@ -180,20 +170,10 @@ void DownloadColorImage(vk::CommandBuffer& cmdbuf, VkImage image, VkBuffer buffe.imageOffset{.x = 0, .y = 0, .z = 0},.imageExtent{extent},};- const VkPipelineStageFlags src_stages_copy =- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages_copy, VK_PIPELINE_STAGE_TRANSFER_BIT, 0,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0,read_barrier);cmdbuf.CopyImageToBuffer(image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, buffer, copy);- const VkPipelineStageFlags dst_stages_copy =- VK_PIPELINE_STAGE_HOST_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;- cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stages_copy, 0,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0,memory_write_barrier, nullptr, image_write_barrier);}diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cppindex b10031de10..6256bc8bd8 100644--- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp@@ -436,27 +436,13 @@ void BufferCacheRuntime::CopyBuffer(VkBuffer dst_buffer, VkBuffer src_buffer,scheduler.RequestOutsideRenderPassOperationContext();scheduler.Record([src_buffer, dst_buffer, vk_copies, barrier](vk::CommandBuffer cmdbuf) {if (barrier) {- // Buffer writes can come from vertex input, shaders, or compute- const VkPipelineStageFlags src_stages =- VK_PIPELINE_STAGE_VERTEX_INPUT_BIT |- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,VK_PIPELINE_STAGE_TRANSFER_BIT, 0, READ_BARRIER);}cmdbuf.CopyBuffer(src_buffer, dst_buffer, VideoCommon::FixSmallVectorADL(vk_copies));if (barrier) {- // Buffer reads can go to vertex input, shaders, or compute- const VkPipelineStageFlags dst_stages =- VK_PIPELINE_STAGE_VERTEX_INPUT_BIT |- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT,- dst_stages, 0, WRITE_BARRIER);+ VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, WRITE_BARRIER);}});}@@ -470,36 +456,21 @@ void BufferCacheRuntime::PreCopyBarrier() {};scheduler.RequestOutsideRenderPassOperationContext();scheduler.Record([](vk::CommandBuffer cmdbuf) {- const VkPipelineStageFlags src_stages =- VK_PIPELINE_STAGE_VERTEX_INPUT_BIT |- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages, VK_PIPELINE_STAGE_TRANSFER_BIT,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,0, READ_BARRIER);});}void BufferCacheRuntime::PostCopyBarrier() {- // Specific access flags for buffer destinations: vertex input, uniforms, storage, indexstatic constexpr VkMemoryBarrier WRITE_BARRIER{.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,.pNext = nullptr,.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,- .dstAccessMask = VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT | VK_ACCESS_INDEX_READ_BIT |- VK_ACCESS_UNIFORM_READ_BIT | VK_ACCESS_SHADER_READ_BIT |- VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_INDIRECT_COMMAND_READ_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,};scheduler.RequestOutsideRenderPassOperationContext();scheduler.Record([](vk::CommandBuffer cmdbuf) {- const VkPipelineStageFlags dst_stages =- VK_PIPELINE_STAGE_VERTEX_INPUT_BIT |- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;- cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stages,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,0, WRITE_BARRIER);});}@@ -523,24 +494,10 @@ void BufferCacheRuntime::ClearBuffer(VkBuffer dest_buffer, u32 offset, size_t sischeduler.RequestOutsideRenderPassOperationContext();scheduler.Record([dest_buffer, offset, size, value](vk::CommandBuffer cmdbuf) {- // Buffer writes can come from vertex input, shaders, or compute- const VkPipelineStageFlags src_stages_clear =- VK_PIPELINE_STAGE_VERTEX_INPUT_BIT |- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages_clear, VK_PIPELINE_STAGE_TRANSFER_BIT,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,0, READ_BARRIER);cmdbuf.FillBuffer(dest_buffer, offset, size, value);- // Buffer reads can go to vertex input, shaders, or compute- const VkPipelineStageFlags dst_stages_clear =- VK_PIPELINE_STAGE_VERTEX_INPUT_BIT |- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;- cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stages_clear,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,0, WRITE_BARRIER);});}diff --git a/src/video_core/renderer_vulkan/vk_compute_pass.cpp b/src/video_core/renderer_vulkan/vk_compute_pass.cppindex c978906c38..22e646afe9 100644--- a/src/video_core/renderer_vulkan/vk_compute_pass.cpp+++ b/src/video_core/renderer_vulkan/vk_compute_pass.cpp@@ -446,26 +446,13 @@ void ConditionalRenderingResolvePass::Resolve(VkBuffer dst_buffer, VkBuffer src_const VkDescriptorSet set = descriptor_allocator.Commit();device.GetLogical().UpdateDescriptorSet(set, *descriptor_template, descriptor_data);- // Memory writes can come from graphics or compute stages- const VkPipelineStageFlags src_stages_compute =- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages_compute,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, read_barrier);cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, *pipeline);cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_COMPUTE, *layout, 0, set, {});cmdbuf.Dispatch(1, 1, 1);- // Conditional rendering result used by draw indirect or conditional rendering- const VkPipelineStageFlags dst_stages_cond =- VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT |- VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT |- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,- dst_stages_cond, 0, write_barrier);+ VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, write_barrier);});}@@ -533,29 +520,14 @@ void QueriesPrefixScanPass::Run(VkBuffer accumulation_buffer, VkBuffer dst_buffeconst VkDescriptorSet set = descriptor_allocator.Commit();device.GetLogical().UpdateDescriptorSet(set, *descriptor_template, descriptor_data);- // Memory writes can come from graphics or compute stages- const VkPipelineStageFlags src_stages_scan =- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages_scan,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, read_barrier);cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, *pipeline);cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_COMPUTE, *layout, 0, set, {});cmdbuf.PushConstants(*layout, VK_SHADER_STAGE_COMPUTE_BIT, uniforms);cmdbuf.Dispatch(1, 1, 1);- // Query prefix scan results used by draw indirect, conditional rendering, or shaders- const VkPipelineStageFlags dst_stages_scan =- VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT |- VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT |- VK_PIPELINE_STAGE_VERTEX_INPUT_BIT |- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT;cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,- dst_stages_scan, 0, write_barrier);+ VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, write_barrier);});}}@@ -607,15 +579,8 @@ void ASTCDecoderPass::Assemble(Image& image, const StagingBufferRef& map,.layerCount = VK_REMAINING_ARRAY_LAYERS,},};- // If initialized, memory writes can come from graphics or compute stages- const VkPipelineStageFlags src_stages_astc = is_initialized ?- (VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT) :- VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;- cmdbuf.PipelineBarrier(src_stages_astc,+ cmdbuf.PipelineBarrier(is_initialized ? VK_PIPELINE_STAGE_ALL_COMMANDS_BIT+ : VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, image_barrier);cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, vk_pipeline);});diff --git a/src/video_core/renderer_vulkan/vk_present_manager.cpp b/src/video_core/renderer_vulkan/vk_present_manager.cppindex 3960f78343..3b5c2e3c01 100644--- a/src/video_core/renderer_vulkan/vk_present_manager.cpp+++ b/src/video_core/renderer_vulkan/vk_present_manager.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project@@ -441,13 +441,7 @@ void PresentManager::CopyToSwapchainImpl(Frame* frame) {},};- // Previous operations that might have written to the frame image- const VkPipelineStageFlags src_stages_present =- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages_present, VK_PIPELINE_STAGE_TRANSFER_BIT, {},+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, {},{}, {}, pre_barriers);if (blit_supported) {diff --git a/src/video_core/renderer_vulkan/vk_query_cache.cpp b/src/video_core/renderer_vulkan/vk_query_cache.cppindex c035eb7cd9..415259c72c 100644--- a/src/video_core/renderer_vulkan/vk_query_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_query_cache.cpp@@ -809,19 +809,12 @@ public:.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,.pNext = nullptr,.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,- .dstAccessMask = VK_ACCESS_HOST_READ_BIT | VK_ACCESS_SHADER_READ_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,};scheduler.RequestOutsideRenderPassOperationContext();scheduler.Record([](vk::CommandBuffer cmdbuf) {- // After transfer, results may be read by host or used in subsequent operations- const VkPipelineStageFlags dst_stages_query =- VK_PIPELINE_STAGE_HOST_BIT |- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT,- dst_stages_query, 0, WRITE_BARRIER);+ VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, WRITE_BARRIER);});std::scoped_lock lk(flush_guard);@@ -949,7 +942,7 @@ private:.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,.pNext = nullptr,.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,- .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT,};scheduler.RequestOutsideRenderPassOperationContext();scheduler.Record([dst_buffer = current_bank->GetBuffer(),@@ -1482,40 +1475,22 @@ void QueryCacheRuntime::Barriers(bool is_prebarrier) {.srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT,.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_TRANSFER_WRITE_BIT,};- // Query results may be read by host or used in shaders/indirect commandsstatic constexpr VkMemoryBarrier WRITE_BARRIER{.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,.pNext = nullptr,.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,- .dstAccessMask = VK_ACCESS_HOST_READ_BIT | VK_ACCESS_SHADER_READ_BIT |- VK_ACCESS_INDIRECT_COMMAND_READ_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,};impl->scheduler.RequestOutsideRenderPassOperationContext();if (is_prebarrier) {impl->scheduler.Record([](vk::CommandBuffer cmdbuf) {- // Query data can be written by graphics or compute stages- const VkPipelineStageFlags src_stages_query =- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages_query,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,VK_PIPELINE_STAGE_TRANSFER_BIT, 0, READ_BARRIER);});} else {impl->scheduler.Record([](vk::CommandBuffer cmdbuf) {- // Query results may be read by host or used in shaders/indirect commands- const VkPipelineStageFlags dst_stages_query =- VK_PIPELINE_STAGE_HOST_BIT |- VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT |- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT;cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT,- dst_stages_query, 0, WRITE_BARRIER);+ VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, WRITE_BARRIER);});}}diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cppindex 4d508fc2f2..60b899a811 100644--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp@@ -586,23 +586,14 @@ void RasterizerVulkan::DispatchCompute() {}const std::array<u32, 3> dim{qmd.grid_dim_x, qmd.grid_dim_y, qmd.grid_dim_z};scheduler.RequestOutsideRenderPassOperationContext();- // Compute shader reads from storage buffers, uniforms, and imagesstatic constexpr VkMemoryBarrier READ_BARRIER{.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,.pNext = nullptr,- .srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,- .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_UNIFORM_READ_BIT,+ .srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT,};- scheduler.Record([](vk::CommandBuffer cmdbuf) {- // Memory writes can come from graphics or compute stages- const VkPipelineStageFlags src_stages =- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;- cmdbuf.PipelineBarrier(src_stages, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,- 0, READ_BARRIER);- });+ scheduler.Record([](vk::CommandBuffer cmdbuf) { cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,+ 0, READ_BARRIER); });scheduler.Record([dim](vk::CommandBuffer cmdbuf) { cmdbuf.Dispatch(dim[0], dim[1], dim[2]); });// Log compute dispatchdiff --git a/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp b/src/video_core/renderer_vulkan/vk_render_pass_cache.cppindex 1d7af349d1..118b2a0832 100644--- a/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp@@ -44,19 +44,13 @@ using VideoCore::Surface::SurfaceType;}VkAttachmentDescription AttachmentDescription(const Device& device, PixelFormat format,- VkSampleCountFlagBits samples,- bool is_depth_stencil) {+ VkSampleCountFlagBits samples) {using MaxwellToVK::SurfaceFormat;const SurfaceType surface_type = GetSurfaceType(format);const bool has_stencil = surface_type == SurfaceType::DepthStencil ||surface_type == SurfaceType::Stencil;- // Use optimal layouts for attachments - this allows drivers to optimize tiling and access patterns- const VkImageLayout attachment_layout = is_depth_stencil- ? VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL- : VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;-return {.flags = {},.format = SurfaceFormat(device, FormatType::Optimal, true, format).format,@@ -67,8 +61,8 @@ using VideoCore::Surface::SurfaceType;: VK_ATTACHMENT_LOAD_OP_DONT_CARE,.stencilStoreOp = has_stencil ? VK_ATTACHMENT_STORE_OP_STORE: VK_ATTACHMENT_STORE_OP_DONT_CARE,- .initialLayout = attachment_layout,- .finalLayout = attachment_layout,+ .initialLayout = VK_IMAGE_LAYOUT_GENERAL,+ .finalLayout = VK_IMAGE_LAYOUT_GENERAL,};}} // Anonymous namespace@@ -90,10 +84,10 @@ VkRenderPass RenderPassCache::Get(const RenderPassKey& key) {const bool is_valid{format != PixelFormat::Invalid};references[index] = VkAttachmentReference{.attachment = is_valid ? num_colors : VK_ATTACHMENT_UNUSED,- .layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,+ .layout = VK_IMAGE_LAYOUT_GENERAL,};if (is_valid) {- descriptions.push_back(AttachmentDescription(*device, format, key.samples, false));+ descriptions.push_back(AttachmentDescription(*device, format, key.samples));num_attachments = static_cast<u32>(index + 1);++num_colors;}@@ -103,9 +97,9 @@ VkRenderPass RenderPassCache::Get(const RenderPassKey& key) {if (key.depth_format != PixelFormat::Invalid) {depth_reference = VkAttachmentReference{.attachment = num_colors,- .layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,+ .layout = VK_IMAGE_LAYOUT_GENERAL,};- descriptions.push_back(AttachmentDescription(*device, key.depth_format, key.samples, true));+ descriptions.push_back(AttachmentDescription(*device, key.depth_format, key.samples));}const VkSubpassDescription subpass{.flags = 0,diff --git a/src/video_core/renderer_vulkan/vk_scheduler.cpp b/src/video_core/renderer_vulkan/vk_scheduler.cppindex aafcfdf65b..e526d606dc 100644--- a/src/video_core/renderer_vulkan/vk_scheduler.cpp+++ b/src/video_core/renderer_vulkan/vk_scheduler.cpp@@ -264,26 +264,14 @@ u64 Scheduler::SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_seconst u64 signal_value = master_semaphore->NextTick();RecordWithUploadBuffer([signal_semaphore, wait_semaphore, signal_value,this](vk::CommandBuffer cmdbuf, vk::CommandBuffer upload_cmdbuf) {- // Specific access flags for upload destinations: vertex input, uniforms, storage, index, texturesstatic constexpr VkMemoryBarrier WRITE_BARRIER{.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,.pNext = nullptr,.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,- .dstAccessMask = VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT | VK_ACCESS_INDEX_READ_BIT |- VK_ACCESS_UNIFORM_READ_BIT | VK_ACCESS_SHADER_READ_BIT |- VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT |- VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,};- // Specify exact stages that need the transfer results instead of ALL_COMMANDS_BITupload_cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT,- VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_VERTEX_INPUT_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,- 0, WRITE_BARRIER);+ VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, WRITE_BARRIER);upload_cmdbuf.End();cmdbuf.End();@@ -344,11 +332,11 @@ void Scheduler::EndRenderPass()query_cache->CounterEnable(VideoCommon::QueryType::ZPassPixelCount64, false);query_cache->NotifySegment(false);+Record([num_images = num_renderpass_images,images = renderpass_images,ranges = renderpass_image_ranges](vk::CommandBuffer cmdbuf) {std::array<VkImageMemoryBarrier, 9> barriers;- VkPipelineStageFlags src_stages = 0;for (size_t i = 0; i < num_images; ++i) {const VkImageSubresourceRange& range = ranges[i];const bool is_color = (range.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) != 0;@@ -356,76 +344,38 @@ void Scheduler::EndRenderPass()& (VK_IMAGE_ASPECT_DEPTH_BIT| VK_IMAGE_ASPECT_STENCIL_BIT)) !=0;- // Determine optimal destination layout based on image usage- // After render pass, images may be used as shader resources or as attachments again- // Use optimal layouts to allow driver optimizationsVkAccessFlags src_access = 0;- VkAccessFlags dst_access = 0;- VkPipelineStageFlags this_stage = 0;- VkImageLayout new_layout;-- if (is_color) {- // Color attachments can be read as textures or used as attachments again- src_access = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;- this_stage = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;- new_layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;- dst_access = VK_ACCESS_SHADER_READ_BIT- | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT- | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;- } else if (is_depth_stencil) {- // Depth attachments can be read as textures or used as attachments again- src_access = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;- this_stage = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT- | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;- new_layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;- dst_access = VK_ACCESS_SHADER_READ_BIT- | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT- | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;- } else {- // Fallback to GENERAL for unknown usage- src_access = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT- | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;- this_stage = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT- | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT- | VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;- new_layout = VK_IMAGE_LAYOUT_GENERAL;- dst_access = VK_ACCESS_SHADER_READ_BIT- | VK_ACCESS_SHADER_WRITE_BIT- | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT- | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT- | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT- | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;- }- src_stages |= this_stage;++ if (is_color)+ src_access |= VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;+ else if (is_depth_stencil)+ src_access |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;+ else+ src_access |= VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT+ | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;+barriers[i] = VkImageMemoryBarrier{.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,.pNext = nullptr,.srcAccessMask = src_access,- .dstAccessMask = dst_access,- .oldLayout = is_color ? VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL- : (is_depth_stencil ? VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL- : VK_IMAGE_LAYOUT_GENERAL),- .newLayout = new_layout,+ .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT+ | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT+ | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT+ | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT+ | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,+ .oldLayout = VK_IMAGE_LAYOUT_GENERAL,+ .newLayout = VK_IMAGE_LAYOUT_GENERAL,.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,.image = images[i],.subresourceRange = range,};}-cmdbuf.EndRenderPass();-- // Use specific pipeline stages instead of ALL_COMMANDS_BIT for better parallelism- // The destination stages depend on how the images will be used next- const VkPipelineStageFlags dst_stages =- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;-- cmdbuf.PipelineBarrier(src_stages,- dst_stages,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |+ VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |+ VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,+ VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,0,nullptr,nullptr,diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cppindex 0069f10f9c..348e49fb6d 100644--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp@@ -810,8 +810,7 @@ void BlitScale(Scheduler& scheduler, VkImage src_image, VkImage dst_image, const.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,.pNext = nullptr,.srcAccessMask = 0,- .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT |- VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_WRITE_BIT | VK_ACCESS_MEMORY_READ_BIT,.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,.newLayout = VK_IMAGE_LAYOUT_GENERAL,.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,@@ -823,8 +822,7 @@ void BlitScale(Scheduler& scheduler, VkImage src_image, VkImage dst_image, const.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,.pNext = nullptr,.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,- .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT |- VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_WRITE_BIT | VK_ACCESS_MEMORY_READ_BIT,.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,.newLayout = VK_IMAGE_LAYOUT_GENERAL,.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,@@ -833,26 +831,11 @@ void BlitScale(Scheduler& scheduler, VkImage src_image, VkImage dst_image, const.subresourceRange = subresource_range,},};- // Use specific pipeline stages for better parallelism- const VkPipelineStageFlags src_stages =- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages, VK_PIPELINE_STAGE_TRANSFER_BIT,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,0, nullptr, nullptr, read_barriers);cmdbuf.BlitImage(src_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_image,VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, regions, vk_filter);- // After transfer, images may be used in graphics, compute, or as attachments- const VkPipelineStageFlags dst_stages =- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;- cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stages,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,0, nullptr, nullptr, write_barriers);});}@@ -1040,12 +1023,11 @@ void TextureCacheRuntime::ReinterpretImage(Image& dst, Image& src,.srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT,.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_TRANSFER_WRITE_BIT,};- // After reinterpret, buffers used as transfer source, uniforms, or storagestatic constexpr VkMemoryBarrier WRITE_BARRIER{.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,.pNext = nullptr,.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,- .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_SHADER_READ_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,};const std::array pre_barriers{VkImageMemoryBarrier{@@ -1112,39 +1094,18 @@ void TextureCacheRuntime::ReinterpretImage(Image& dst, Image& src,.subresourceRange = dst_range.SubresourceRange(dst_aspect_mask),},};- const VkPipelineStageFlags src_stages_transfer =- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages_transfer, VK_PIPELINE_STAGE_TRANSFER_BIT,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,0, {}, {}, pre_barriers);cmdbuf.CopyImageToBuffer(src_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, copy_buffer,vk_in_copies);- const VkPipelineStageFlags dst_stages_transfer =- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stages_transfer,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,0, WRITE_BARRIER, nullptr, middle_in_barrier);- cmdbuf.PipelineBarrier(src_stages_transfer, VK_PIPELINE_STAGE_TRANSFER_BIT,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,0, READ_BARRIER, {}, middle_out_barrier);cmdbuf.CopyBufferToImage(copy_buffer, dst_image, VK_IMAGE_LAYOUT_GENERAL, vk_out_copies);- // After reinterpret copy, image may be used in shaders or as attachment- const VkPipelineStageFlags dst_stages_post =- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;- cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stages_post,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,0, {}, {}, post_barriers);});}@@ -1271,12 +1232,7 @@ void TextureCacheRuntime::BlitImage(Framebuffer* dst_framebuffer, ImageView& dst.layerCount = VK_REMAINING_ARRAY_LAYERS,},};- const VkPipelineStageFlags src_stages_resolve =- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages_resolve, VK_PIPELINE_STAGE_TRANSFER_BIT,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,0, nullptr, nullptr, read_barriers);if (is_resolve) {cmdbuf.ResolveImage(src_image, VK_IMAGE_LAYOUT_GENERAL, dst_image,@@ -1289,14 +1245,7 @@ void TextureCacheRuntime::BlitImage(Framebuffer* dst_framebuffer, ImageView& dstsrc_image, VK_IMAGE_LAYOUT_GENERAL, dst_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,MakeImageBlit(dst_region, src_region, dst_layers, src_layers), vk_filter);}- // After blit/resolve, image may be used in shaders or as attachment- const VkPipelineStageFlags dst_stages_blit =- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;- cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stages_blit,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,0, write_barrier);});}@@ -1874,14 +1823,7 @@ void Image::DownloadMemory(std::span<VkBuffer> buffers_span, std::span<size_t> o.layerCount = VK_REMAINING_ARRAY_LAYERS,},};- const VkPipelineStageFlags src_stages_download =- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages_download, VK_PIPELINE_STAGE_TRANSFER_BIT,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,0, read_barrier);for (size_t index = 0; index < buffers.size(); index++) {@@ -1889,20 +1831,17 @@ void Image::DownloadMemory(std::span<VkBuffer> buffers_span, std::span<size_t> ovk_copies[index]);}- // Host will read the downloaded dataconst VkMemoryBarrier memory_write_barrier{.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,.pNext = nullptr,- .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,- .dstAccessMask = VK_ACCESS_HOST_READ_BIT,+ .srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,};- // Image will be used for shaders or as attachmentconst VkImageMemoryBarrier image_write_barrier{.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,.pNext = nullptr,.srcAccessMask = 0,- .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT |- VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_WRITE_BIT,.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,.newLayout = VK_IMAGE_LAYOUT_GENERAL,.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,@@ -1916,13 +1855,7 @@ void Image::DownloadMemory(std::span<VkBuffer> buffers_span, std::span<size_t> o.layerCount = VK_REMAINING_ARRAY_LAYERS,},};- const VkPipelineStageFlags dst_stages_download =- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;- cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stages_download,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,0, memory_write_barrier, nullptr, image_write_barrier);});return;@@ -1957,15 +1890,7 @@ void Image::DownloadMemory(std::span<VkBuffer> buffers_span, std::span<size_t> o.layerCount = VK_REMAINING_ARRAY_LAYERS,},};- // Image writes can come from graphics or compute stages- const VkPipelineStageFlags src_stages_img =- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;- cmdbuf.PipelineBarrier(src_stages_img, VK_PIPELINE_STAGE_TRANSFER_BIT,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,0, read_barrier);for (size_t index = 0; index < buffers.size(); index++) {@@ -1997,14 +1922,7 @@ void Image::DownloadMemory(std::span<VkBuffer> buffers_span, std::span<size_t> o.layerCount = VK_REMAINING_ARRAY_LAYERS,},};- // After download, image may be used in shaders or as attachment- const VkPipelineStageFlags dst_stages_img =- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;- cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stages_img,+ cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,0, memory_write_barrier, nullptr, image_write_barrier);});}@@ -2566,9 +2484,7 @@ void TextureCacheRuntime::TransitionImageLayout(Image& image) {.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,.pNext = nullptr,.srcAccessMask = VK_ACCESS_NONE,- .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT |- VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT |- VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,+ .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED,.newLayout = VK_IMAGE_LAYOUT_GENERAL,.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,@@ -2584,16 +2500,8 @@ void TextureCacheRuntime::TransitionImageLayout(Image& image) {};scheduler.RequestOutsideRenderPassOperationContext();scheduler.Record([barrier](vk::CommandBuffer cmdbuf) {- // After layout transition, image may be used in shaders or as attachment- const VkPipelineStageFlags dst_stages_layout =- VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |- VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |- VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |- VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |- VK_PIPELINE_STAGE_TRANSFER_BIT;cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,- dst_stages_layout, 0, barrier);+ VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, barrier);});}}