VERY experimental Nintendo Switch 2 emulator
C++
Changes based on hardware tests
Squall-Leonhart3785a469c05e
diff --git a/src/video_core/host_shaders/CMakeLists.txt b/src/video_core/host_shaders/CMakeLists.txtindex cff8e38d68..cd25492328 100644--- a/src/video_core/host_shaders/CMakeLists.txt+++ b/src/video_core/host_shaders/CMakeLists.txt@@ -21,7 +21,6 @@ set(SHADER_FILESconvert_abgr8_to_d24s8.fragconvert_abgr8_to_d32f.fragconvert_d32f_to_abgr8.frag- convert_d32f_to_bgra8.fragconvert_d24s8_to_abgr8.fragconvert_depth_to_float.fragconvert_float_to_depth.fragdiff --git a/src/video_core/host_shaders/convert_abgr8_to_d32f.frag b/src/video_core/host_shaders/convert_abgr8_to_d32f.fragindex a1880b9163..095b910c29 100644--- a/src/video_core/host_shaders/convert_abgr8_to_d32f.frag+++ b/src/video_core/host_shaders/convert_abgr8_to_d32f.frag@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2023 Your Project+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later#version 450@@ -9,10 +9,7 @@ void main() {ivec2 coord = ivec2(gl_FragCoord.xy);vec4 color = texelFetch(color_texture, coord, 0).abgr;- uvec4 bytes = uvec4(color * (exp2(8) - 1.0f)) << uvec4(24, 16, 8, 0);- uint depth_unorm = bytes.x | bytes.y | bytes.z | bytes.w;+ float value = color.a * (color.r + color.g + color.b) / 3.0f;- float depth_float = uintBitsToFloat(depth_unorm);-- gl_FragDepth = depth_float;+ gl_FragDepth = value;}diff --git a/src/video_core/host_shaders/convert_d32f_to_bgra8.frag b/src/video_core/host_shaders/convert_d32f_to_bgra8.fragdeleted file mode 100644index 789c3e0781..0000000000--- a/src/video_core/host_shaders/convert_d32f_to_bgra8.frag+++ /dev/null@@ -1,15 +0,0 @@-// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project-// SPDX-License-Identifier: GPL-2.0-or-later--#version 450--layout(binding = 0) uniform sampler2D depth_tex;--layout(location = 0) out vec4 color;--void main() {- ivec2 coord = ivec2(gl_FragCoord.xy);- float depth = texelFetch(depth_tex, coord, 0).r;- color = vec4(depth, depth, depth, 1.0);- color = color.bgra; // Swap color channels for BGRA format-}diff --git a/src/video_core/renderer_vulkan/blit_image.cpp b/src/video_core/renderer_vulkan/blit_image.cppindex 5030dd2004..1a40a4d054 100644--- a/src/video_core/renderer_vulkan/blit_image.cpp+++ b/src/video_core/renderer_vulkan/blit_image.cpp@@ -11,7 +11,6 @@#include "video_core/host_shaders/convert_abgr8_to_d32f_frag_spv.h"#include "video_core/host_shaders/convert_d24s8_to_abgr8_frag_spv.h"#include "video_core/host_shaders/convert_d32f_to_abgr8_frag_spv.h"-#include "video_core/host_shaders/convert_d32f_to_bgra8_frag_spv.h"#include "video_core/host_shaders/convert_depth_to_float_frag_spv.h"#include "video_core/host_shaders/convert_float_to_depth_frag_spv.h"#include "video_core/host_shaders/convert_s8d24_to_abgr8_frag_spv.h"@@ -440,7 +439,6 @@ BlitImageHelper::BlitImageHelper(const Device& device_, Scheduler& scheduler_,convert_d32f_to_abgr8_frag(BuildShader(device, CONVERT_D32F_TO_ABGR8_FRAG_SPV)),convert_d24s8_to_abgr8_frag(BuildShader(device, CONVERT_D24S8_TO_ABGR8_FRAG_SPV)),convert_s8d24_to_abgr8_frag(BuildShader(device, CONVERT_S8D24_TO_ABGR8_FRAG_SPV)),- convert_d32f_to_bgra8_frag(BuildShader(device, CONVERT_D32F_TO_BGRA8_FRAG_SPV)),linear_sampler(device.GetLogical().CreateSampler(SAMPLER_CREATE_INFO<VK_FILTER_LINEAR>)),nearest_sampler(device.GetLogical().CreateSampler(SAMPLER_CREATE_INFO<VK_FILTER_NEAREST>)) {}@@ -591,13 +589,6 @@ void BlitImageHelper::ConvertS8D24ToABGR8(const Framebuffer* dst_framebuffer,ConvertDepthStencil(*convert_s8d24_to_abgr8_pipeline, dst_framebuffer, src_image_view);}-void BlitImageHelper::ConvertD32FToBGRA8(const Framebuffer* dst_framebuffer,- ImageView& src_image_view) {- ConvertPipelineColorTargetEx(convert_d32f_to_bgra8_pipeline, dst_framebuffer->RenderPass(),- convert_d32f_to_bgra8_frag);- ConvertDepthStencil(*convert_d32f_to_bgra8_pipeline, dst_framebuffer, src_image_view);-}-void BlitImageHelper::ClearColor(const Framebuffer* dst_framebuffer, u8 color_mask,const std::array<f32, 4>& clear_color,const Region2D& dst_region) {diff --git a/src/video_core/renderer_vulkan/blit_image.h b/src/video_core/renderer_vulkan/blit_image.hindex b3281ff3ea..b2104a59ee 100644--- a/src/video_core/renderer_vulkan/blit_image.h+++ b/src/video_core/renderer_vulkan/blit_image.h@@ -75,8 +75,6 @@ public:void ConvertS8D24ToABGR8(const Framebuffer* dst_framebuffer, ImageView& src_image_view);- void ConvertD32FToBGRA8(const Framebuffer* dst_framebuffer, ImageView& src_image_view);-void ClearColor(const Framebuffer* dst_framebuffer, u8 color_mask,const std::array<f32, 4>& clear_color, const Region2D& dst_region);@@ -138,7 +136,6 @@ private:vk::ShaderModule convert_d32f_to_abgr8_frag;vk::ShaderModule convert_d24s8_to_abgr8_frag;vk::ShaderModule convert_s8d24_to_abgr8_frag;- vk::ShaderModule convert_d32f_to_bgra8_frag;vk::Sampler linear_sampler;vk::Sampler nearest_sampler;@@ -159,7 +156,6 @@ private:vk::Pipeline convert_d32f_to_abgr8_pipeline;vk::Pipeline convert_d24s8_to_abgr8_pipeline;vk::Pipeline convert_s8d24_to_abgr8_pipeline;- vk::Pipeline convert_d32f_to_bgra8_pipeline;};} // namespace Vulkandiff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cppindex a4ee9295f6..cdc41816f9 100644--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp@@ -1211,12 +1211,12 @@ void TextureCacheRuntime::ConvertImage(Framebuffer* dst, ImageView& dst_view, Imbreak;case PixelFormat::B8G8R8A8_SRGB:if (src_view.format == PixelFormat::D32_FLOAT) {- return blit_image_helper.ConvertD32FToBGRA8(dst, src_view);+ return blit_image_helper.ConvertD32FToABGR8(dst, src_view);}break;case PixelFormat::B8G8R8A8_UNORM:if (src_view.format == PixelFormat::D32_FLOAT) {- return blit_image_helper.ConvertD32FToBGRA8(dst, src_view);+ return blit_image_helper.ConvertD32FToABGR8(dst, src_view);}break;case PixelFormat::R32_FLOAT: