VERY experimental Nintendo Switch 2 emulator
C++
[Vk] Improve Stencil Handling and Fix Read-After-Write Hazard (#235)
wildcard4eb6d10d6236
diff --git a/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp b/src/video_core/renderer_vulkan/vk_render_pass_cache.cppindex 7746a88d34..80ff75e3b9 100644--- a/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -14,23 +17,55 @@namespace Vulkan {namespace {using VideoCore::Surface::PixelFormat;+using VideoCore::Surface::SurfaceType;-VkAttachmentDescription AttachmentDescription(const Device& device, PixelFormat format,- VkSampleCountFlagBits samples) {- using MaxwellToVK::SurfaceFormat;- return {- .flags = {},- .format = SurfaceFormat(device, FormatType::Optimal, true, format).format,- .samples = samples,- .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,- .storeOp = VK_ATTACHMENT_STORE_OP_STORE,- .stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD,- .stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE,- .initialLayout = VK_IMAGE_LAYOUT_GENERAL,- .finalLayout = VK_IMAGE_LAYOUT_GENERAL,- };-}-} // Anonymous namespace+ constexpr SurfaceType GetSurfaceType(PixelFormat format) {+ switch (format) {+ // Depth formats+ case PixelFormat::D16_UNORM:+ case PixelFormat::D32_FLOAT:+ case PixelFormat::X8_D24_UNORM:+ return SurfaceType::Depth;++ // Stencil formats+ case PixelFormat::S8_UINT:+ return SurfaceType::Stencil;++ // Depth+Stencil formats+ case PixelFormat::D24_UNORM_S8_UINT:+ case PixelFormat::S8_UINT_D24_UNORM:+ case PixelFormat::D32_FLOAT_S8_UINT:+ return SurfaceType::DepthStencil;++ // Everything else is a color texture+ default:+ return SurfaceType::ColorTexture;+ }+ }++ VkAttachmentDescription AttachmentDescription(const Device& device, PixelFormat format,+ VkSampleCountFlagBits samples) {+ using MaxwellToVK::SurfaceFormat;++ const SurfaceType surface_type = GetSurfaceType(format);+ const bool has_stencil = surface_type == SurfaceType::DepthStencil ||+ surface_type == SurfaceType::Stencil;++ return {+ .flags = {},+ .format = SurfaceFormat(device, FormatType::Optimal, true, format).format,+ .samples = samples,+ .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,+ .storeOp = VK_ATTACHMENT_STORE_OP_STORE,+ .stencilLoadOp = has_stencil ? VK_ATTACHMENT_LOAD_OP_LOAD+ : VK_ATTACHMENT_LOAD_OP_DONT_CARE,+ .stencilStoreOp = has_stencil ? VK_ATTACHMENT_STORE_OP_STORE+ : VK_ATTACHMENT_STORE_OP_DONT_CARE,+ .initialLayout = VK_IMAGE_LAYOUT_GENERAL,+ .finalLayout = VK_IMAGE_LAYOUT_GENERAL,+ };+ }+ } // Anonymous namespaceRenderPassCache::RenderPassCache(const Device& device_) : device{&device_} {}@@ -78,6 +113,18 @@ VkRenderPass RenderPassCache::Get(const RenderPassKey& key) {.preserveAttachmentCount = 0,.pPreserveAttachments = nullptr,};+ const VkSubpassDependency dependency{+ .srcSubpass = 0, // Current subpass+ .dstSubpass = 0, // Same subpass (self-dependency)+ .srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |+ VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |+ VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,+ .dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,+ .srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT |+ VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,+ .dstAccessMask = VK_ACCESS_SHADER_READ_BIT,+ .dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT+ };pair->second = device->GetLogical().CreateRenderPass({.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO,.pNext = nullptr,@@ -86,8 +133,8 @@ VkRenderPass RenderPassCache::Get(const RenderPassKey& key) {.pAttachments = descriptions.empty() ? nullptr : descriptions.data(),.subpassCount = 1,.pSubpasses = &subpass,- .dependencyCount = 0,- .pDependencies = nullptr,+ .dependencyCount = 1,+ .pDependencies = &dependency,});return *pair->second;}