diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2019-10-31 02:56:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 02:56:29 +0100 |
| commit | 11e39da02bec92fe4a332bfb737323ccb8087626 (patch) | |
| tree | 4e206c28928fbda8e4e82ee7c377c6dcb6e992b6 /src | |
| parent | Merge pull request #3050 from FernandoS27/fix-tld4 (diff) | |
| parent | Shader_IR: Fix regression on TLD4 (diff) | |
| download | yuzu-11e39da02bec92fe4a332bfb737323ccb8087626.tar yuzu-11e39da02bec92fe4a332bfb737323ccb8087626.tar.gz yuzu-11e39da02bec92fe4a332bfb737323ccb8087626.tar.bz2 yuzu-11e39da02bec92fe4a332bfb737323ccb8087626.tar.lz yuzu-11e39da02bec92fe4a332bfb737323ccb8087626.tar.xz yuzu-11e39da02bec92fe4a332bfb737323ccb8087626.tar.zst yuzu-11e39da02bec92fe4a332bfb737323ccb8087626.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/shader/decode/texture.cpp | 7 | ||||
| -rw-r--r-- | src/video_core/shader/shader_ir.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/video_core/shader/decode/texture.cpp b/src/video_core/shader/decode/texture.cpp index 0599ef34f..4c838c8bb 100644 --- a/src/video_core/shader/decode/texture.cpp +++ b/src/video_core/shader/decode/texture.cpp @@ -119,7 +119,7 @@ u32 ShaderIR::DecodeTexture(NodeBlock& bb, u32 pc) { : instr.tld4.UsesMiscMode(TextureMiscMode::AOFFI); WriteTexInstructionFloat( bb, instr, - GetTld4Code(instr, texture_type, depth_compare, is_array, is_aoffi, is_bindless), true); + GetTld4Code(instr, texture_type, depth_compare, is_array, is_aoffi, is_bindless)); break; } case OpCode::Id::TLD4S: { @@ -366,11 +366,10 @@ const Sampler& ShaderIR::GetBindlessSampler(const Tegra::Shader::Register& reg, return *used_samplers.emplace(entry).first; } -void ShaderIR::WriteTexInstructionFloat(NodeBlock& bb, Instruction instr, const Node4& components, - bool is_tld4) { +void ShaderIR::WriteTexInstructionFloat(NodeBlock& bb, Instruction instr, const Node4& components) { u32 dest_elem = 0; for (u32 elem = 0; elem < 4; ++elem) { - if (!is_tld4 && !instr.tex.IsComponentEnabled(elem)) { + if (!instr.tex.IsComponentEnabled(elem)) { // Skip disabled components continue; } diff --git a/src/video_core/shader/shader_ir.h b/src/video_core/shader/shader_ir.h index 7582999a5..b5567f54e 100644 --- a/src/video_core/shader/shader_ir.h +++ b/src/video_core/shader/shader_ir.h @@ -326,7 +326,7 @@ private: Node BitfieldInsert(Node base, Node insert, u32 offset, u32 bits); void WriteTexInstructionFloat(NodeBlock& bb, Tegra::Shader::Instruction instr, - const Node4& components, bool is_tld4 = false); + const Node4& components); void WriteTexsInstructionFloat(NodeBlock& bb, Tegra::Shader::Instruction instr, const Node4& components, bool ignore_mask = false); |