TextureCache: Simplify blitting of D24S8 formats and fix bugs.

5 files changed, 0 insertions, 104 deletions

diff --git a/src/video_core/host_shaders/CMakeLists.txt b/src/video_core/host_shaders/CMakeLists.txt
index 1c91999d7..fd3e41434 100644
--- a/src/video_core/host_shaders/CMakeLists.txt
+++ b/src/video_core/host_shaders/CMakeLists.txt
@@ -11,13 +11,9 @@ set(SHADER_FILES
     block_linear_unswizzle_2d.comp
     block_linear_unswizzle_3d.comp
     convert_abgr8_to_d24s8.frag
-    convert_b10g11r11_to_d24s8.frag
     convert_d24s8_to_abgr8.frag
-    convert_d24s8_to_b10g11r11.frag
-    convert_d24s8_to_r16g16.frag
     convert_depth_to_float.frag
     convert_float_to_depth.frag
-    convert_r16g16_to_d24s8.frag
     full_screen_triangle.vert
     fxaa.frag
     fxaa.vert
diff --git a/src/video_core/host_shaders/convert_b10g11r11_to_d24s8.frag b/src/video_core/host_shaders/convert_b10g11r11_to_d24s8.frag
deleted file mode 100644
index 11bdd861d..000000000
--- a/src/video_core/host_shaders/convert_b10g11r11_to_d24s8.frag
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#version 450
-#extension GL_ARB_shader_stencil_export : require
-
-layout(binding = 0) uniform sampler2D color_texture;
-
-uint conv_from_float(float value_f, uint mantissa_bits) {
-    uint value = floatBitsToInt(value_f);
-    uint exp = (value >> 23) & 0x1Fu;
-    uint mantissa_shift = 32u - mantissa_bits;
-    uint mantissa = (value << 9u) >> mantissa_shift;
-    return (exp << mantissa_bits) | mantissa;
-}
-
-void main() {
-    ivec2 coord = ivec2(gl_FragCoord.xy);
-    vec4 color = texelFetch(color_texture, coord, 0).rgba;
-    uint depth_stencil_unorm = (conv_from_float(color.r, 6u) << 21)
-                      | (conv_from_float(color.g, 6u) << 10)
-                      | conv_from_float(color.b, 5u);
-
-    gl_FragDepth = float(depth_stencil_unorm & 0x00FFFFFFu) / (exp2(24.0) - 1.0f);
-    gl_FragStencilRefARB = int(depth_stencil_unorm >> 24);
-}
diff --git a/src/video_core/host_shaders/convert_d24s8_to_b10g11r11.frag b/src/video_core/host_shaders/convert_d24s8_to_b10g11r11.frag
deleted file mode 100644
index c2d935fcd..000000000
--- a/src/video_core/host_shaders/convert_d24s8_to_b10g11r11.frag
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#version 450
-
-layout(binding = 0) uniform sampler2D depth_tex;
-layout(binding = 1) uniform isampler2D stencil_tex;
-
-layout(location = 0) out vec4 color;
-
-float conv_to_float(uint value, uint mantissa_bits) {
-    uint exp = (value >> mantissa_bits) & 0x1Fu;
-    uint mantissa_shift = 32u - mantissa_bits;
-    uint mantissa = (value << mantissa_shift) >> mantissa_shift;
-    return uintBitsToFloat((exp << 23) | (mantissa << (23 - mantissa_bits)));
-}
-
-void main() {
-    ivec2 coord = ivec2(gl_FragCoord.xy);
-    uint depth = uint(textureLod(depth_tex, coord, 0).r * (exp2(32.0) - 1.0f));
-    uint stencil = uint(textureLod(stencil_tex, coord, 0).r);
-    uint depth_stencil = (stencil << 24) | (depth >> 8);
-    uint red_int = (depth_stencil >> 21) & 0x07FF;
-    uint green_int = (depth_stencil >> 10) & 0x07FF;
-    uint blue_int = depth_stencil & 0x03FF;
-
-    color.r = conv_to_float(red_int, 6u);
-    color.g = conv_to_float(green_int, 6u);
-    color.b = conv_to_float(blue_int, 5u);
-    color.a = 1.0f;
-}
diff --git a/src/video_core/host_shaders/convert_d24s8_to_r16g16.frag b/src/video_core/host_shaders/convert_d24s8_to_r16g16.frag
deleted file mode 100644
index c48a7ac66..000000000
--- a/src/video_core/host_shaders/convert_d24s8_to_r16g16.frag
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#version 450
-
-layout(binding = 0) uniform sampler2D depth_tex;
-layout(binding = 1) uniform isampler2D stencil_tex;
-
-layout(location = 0) out vec4 color;
-
-void main() {
-    ivec2 coord = ivec2(gl_FragCoord.xy);
-    uint depth = uint(textureLod(depth_tex, coord, 0).r * (exp2(32.0) - 1.0f));
-    uint stencil = uint(textureLod(stencil_tex, coord, 0).r);
-    uint depth_stencil = (stencil << 24) | (depth >> 8);
-
-    color.r = float(depth_stencil & 0x0000FFFFu) / (exp2(16) - 1.0);
-    color.g = float(depth_stencil >> 16) / (exp2(16) - 1.0);
-    color.b = 0.0f;
-    color.a = 1.0f;
-}
diff --git a/src/video_core/host_shaders/convert_r16g16_to_d24s8.frag b/src/video_core/host_shaders/convert_r16g16_to_d24s8.frag
deleted file mode 100644
index beb2d1284..000000000
--- a/src/video_core/host_shaders/convert_r16g16_to_d24s8.frag
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#version 450
-#extension GL_ARB_shader_stencil_export : require
-
-layout(binding = 0) uniform sampler2D color_texture;
-
-void main() {
-    ivec2 coord = ivec2(gl_FragCoord.xy);
-    vec4 color = texelFetch(color_texture, coord, 0).rgba;
-    uvec2 bytes = uvec2(color.rg * (exp2(16) - 1.0f)) << uvec2(0, 16);
-    uint depth_stencil_unorm =
-        uint(color.r * (exp2(16) - 1.0f)) | (uint(color.g * (exp2(16) - 1.0f)) << 16);
-
-    gl_FragDepth = float(depth_stencil_unorm & 0x00FFFFFFu) / (exp2(24.0) - 1.0f);
-    gl_FragStencilRefARB = int(depth_stencil_unorm >> 24);
-}