VERY experimental Nintendo Switch 2 emulator
C++
Check all swizzle components for red, not just [0], pass float border color rather than int
Kelebek12f525864a809
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cppindex b047e7b3d4..d3eabd686e 100644--- a/src/video_core/renderer_opengl/gl_texture_cache.cpp+++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp@@ -112,13 +112,17 @@ GLenum ImageTarget(Shader::TextureType type, int num_samples = 1) {return GL_NONE;}-GLenum TextureMode(PixelFormat format, bool is_first) {+GLenum TextureMode(PixelFormat format, std::array<SwizzleSource, 4> swizzle) {+ bool any_r =+ std::ranges::any_of(swizzle, [](SwizzleSource s) { return s == SwizzleSource::R; });switch (format) {case PixelFormat::D24_UNORM_S8_UINT:case PixelFormat::D32_FLOAT_S8_UINT:- return is_first ? GL_DEPTH_COMPONENT : GL_STENCIL_INDEX;+ // R = depth, G = stencil+ return any_r ? GL_DEPTH_COMPONENT : GL_STENCIL_INDEX;case PixelFormat::S8_UINT_D24_UNORM:- return is_first ? GL_STENCIL_INDEX : GL_DEPTH_COMPONENT;+ // R = stencil, G = depth+ return any_r ? GL_STENCIL_INDEX : GL_DEPTH_COMPONENT;default:ASSERT(false);return GL_DEPTH_COMPONENT;@@ -208,8 +212,7 @@ void ApplySwizzle(GLuint handle, PixelFormat format, std::array<SwizzleSource, 4case PixelFormat::D32_FLOAT_S8_UINT:case PixelFormat::S8_UINT_D24_UNORM:UNIMPLEMENTED_IF(swizzle[0] != SwizzleSource::R && swizzle[0] != SwizzleSource::G);- glTextureParameteri(handle, GL_DEPTH_STENCIL_TEXTURE_MODE,- TextureMode(format, swizzle[0] == SwizzleSource::R));+ glTextureParameteri(handle, GL_DEPTH_STENCIL_TEXTURE_MODE, TextureMode(format, swizzle));std::ranges::transform(swizzle, swizzle.begin(), ConvertGreenRed);break;case PixelFormat::A5B5G5R1_UNORM: {diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cppindex 719edbcfbe..4ed0aebf74 100644--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp@@ -1064,7 +1064,7 @@ void RasterizerVulkan::UpdateDepthBoundsTestEnable(Tegra::Engines::Maxwell3D::ReLOG_WARNING(Render_Vulkan, "Depth bounds is enabled but not supported");enabled = false;}- scheduler.Record([enable = regs.depth_bounds_enable](vk::CommandBuffer cmdbuf) {+ scheduler.Record([enable = enabled](vk::CommandBuffer cmdbuf) {cmdbuf.SetDepthBoundsTestEnableEXT(enable);});}diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cppindex 80adb70eb0..69b654994c 100644--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp@@ -189,13 +189,16 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {if (info.IsRenderTarget()) {return ImageAspectMask(info.format);}- const bool is_first = info.Swizzle()[0] == SwizzleSource::R;+ bool any_r =+ std::ranges::any_of(info.Swizzle(), [](SwizzleSource s) { return s == SwizzleSource::R; });switch (info.format) {case PixelFormat::D24_UNORM_S8_UINT:case PixelFormat::D32_FLOAT_S8_UINT:- return is_first ? VK_IMAGE_ASPECT_DEPTH_BIT : VK_IMAGE_ASPECT_STENCIL_BIT;+ // R = depth, G = stencil+ return any_r ? VK_IMAGE_ASPECT_DEPTH_BIT : VK_IMAGE_ASPECT_STENCIL_BIT;case PixelFormat::S8_UINT_D24_UNORM:- return is_first ? VK_IMAGE_ASPECT_STENCIL_BIT : VK_IMAGE_ASPECT_DEPTH_BIT;+ // R = stencil, G = depth+ return any_r ? VK_IMAGE_ASPECT_STENCIL_BIT : VK_IMAGE_ASPECT_DEPTH_BIT;case PixelFormat::D16_UNORM:case PixelFormat::D32_FLOAT:return VK_IMAGE_ASPECT_DEPTH_BIT;@@ -1763,7 +1766,7 @@ Sampler::Sampler(TextureCacheRuntime& runtime, const Tegra::Texture::TSCEntry& t.minLod = tsc.mipmap_filter == TextureMipmapFilter::None ? 0.0f : tsc.MinLod(),.maxLod = tsc.mipmap_filter == TextureMipmapFilter::None ? 0.25f : tsc.MaxLod(),.borderColor =- arbitrary_borders ? VK_BORDER_COLOR_INT_CUSTOM_EXT : ConvertBorderColor(color),+ arbitrary_borders ? VK_BORDER_COLOR_FLOAT_CUSTOM_EXT : ConvertBorderColor(color),.unnormalizedCoordinates = VK_FALSE,});}