diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-12-19 05:43:29 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-12-19 20:24:45 +0100 |
commit | 485c21eac3adbc29258da09a16cc8067aaa9b366 (patch) | |
tree | 50223386e64221071fc74f60b97eae7552359004 /src/video_core/renderer_vulkan/vk_shader_decompiler.cpp | |
parent | vk_shader_decompiler: Update sirit and implement Texture AOFFI (diff) | |
download | yuzu-485c21eac3adbc29258da09a16cc8067aaa9b366.tar yuzu-485c21eac3adbc29258da09a16cc8067aaa9b366.tar.gz yuzu-485c21eac3adbc29258da09a16cc8067aaa9b366.tar.bz2 yuzu-485c21eac3adbc29258da09a16cc8067aaa9b366.tar.lz yuzu-485c21eac3adbc29258da09a16cc8067aaa9b366.tar.xz yuzu-485c21eac3adbc29258da09a16cc8067aaa9b366.tar.zst yuzu-485c21eac3adbc29258da09a16cc8067aaa9b366.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_vulkan/vk_shader_decompiler.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp index 93e2704b4..c84f9e4be 100644 --- a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp +++ b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp @@ -543,7 +543,7 @@ private: } for (u32 rt = 0; rt < static_cast<u32>(frag_colors.size()); ++rt) { - if (!IsRenderTargetUsed(rt)) { + if (!specialization.enabled_rendertargets[rt]) { continue; } @@ -1868,12 +1868,18 @@ private: // rendertargets/components are skipped in the register assignment. u32 current_reg = 0; for (u32 rt = 0; rt < Maxwell::NumRenderTargets; ++rt) { + if (!specialization.enabled_rendertargets[rt]) { + // Skip rendertargets that are not enabled + continue; + } // TODO(Subv): Figure out how dual-source blending is configured in the Switch. for (u32 component = 0; component < 4; ++component) { + const Id pointer = AccessElement(t_out_float, frag_colors.at(rt), component); if (header.ps.IsColorComponentOutputEnabled(rt, component)) { - OpStore(AccessElement(t_out_float, frag_colors.at(rt), component), - SafeGetRegister(current_reg)); + OpStore(pointer, SafeGetRegister(current_reg)); ++current_reg; + } else { + OpStore(pointer, component == 3 ? v_float_one : v_float_zero); } } } @@ -2003,15 +2009,6 @@ private: return DeclareBuiltIn(builtin, spv::StorageClass::Input, type, std::move(name)); } - bool IsRenderTargetUsed(u32 rt) const { - for (u32 component = 0; component < 4; ++component) { - if (header.ps.IsColorComponentOutputEnabled(rt, component)) { - return true; - } - } - return false; - } - template <typename... Args> Id AccessElement(Id pointer_type, Id composite, Args... elements_) { std::vector<Id> members; |