diff options
author | Squall-Leonhart <danialhorton@hotmail.com> | 2023-10-16 17:38:07 +0200 |
---|---|---|
committer | Squall-Leonhart <danialhorton@hotmail.com> | 2023-10-16 17:42:40 +0200 |
commit | 326ebbb2fa87f7e4006e1434649ba1f48b4bebfa (patch) | |
tree | 96cf6f308e067b0c4157008ce7a6bca2f7c5bd65 /src/video_core/host_shaders | |
parent | Make Clang happy. (diff) | |
download | yuzu-326ebbb2fa87f7e4006e1434649ba1f48b4bebfa.tar yuzu-326ebbb2fa87f7e4006e1434649ba1f48b4bebfa.tar.gz yuzu-326ebbb2fa87f7e4006e1434649ba1f48b4bebfa.tar.bz2 yuzu-326ebbb2fa87f7e4006e1434649ba1f48b4bebfa.tar.lz yuzu-326ebbb2fa87f7e4006e1434649ba1f48b4bebfa.tar.xz yuzu-326ebbb2fa87f7e4006e1434649ba1f48b4bebfa.tar.zst yuzu-326ebbb2fa87f7e4006e1434649ba1f48b4bebfa.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/host_shaders/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/video_core/host_shaders/convert_abgr8_to_d32f.frag | 9 | ||||
-rw-r--r-- | src/video_core/host_shaders/convert_d32f_to_bgra8.frag | 15 |
3 files changed, 3 insertions, 22 deletions
diff --git a/src/video_core/host_shaders/CMakeLists.txt b/src/video_core/host_shaders/CMakeLists.txt index cff8e38d6..cd2549232 100644 --- a/src/video_core/host_shaders/CMakeLists.txt +++ b/src/video_core/host_shaders/CMakeLists.txt @@ -21,7 +21,6 @@ set(SHADER_FILES convert_abgr8_to_d24s8.frag convert_abgr8_to_d32f.frag convert_d32f_to_abgr8.frag - convert_d32f_to_bgra8.frag convert_d24s8_to_abgr8.frag convert_depth_to_float.frag convert_float_to_depth.frag diff --git a/src/video_core/host_shaders/convert_abgr8_to_d32f.frag b/src/video_core/host_shaders/convert_abgr8_to_d32f.frag index a1880b916..095b910c2 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.frag deleted file mode 100644 index 789c3e078..000000000 --- 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 -} |