diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2019-10-26 01:06:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 01:06:26 +0200 |
| commit | d52598173d0351e88780abc7f3f633b32a0a9a20 (patch) | |
| tree | d0ead491b4a29fa5294a7a3929beb8469607af66 | |
| parent | Merge pull request #3029 from jroweboy/revert (diff) | |
| parent | Shader_Ir: Fix TLD4S from using a component mask. (diff) | |
| download | yuzu-d52598173d0351e88780abc7f3f633b32a0a9a20.tar yuzu-d52598173d0351e88780abc7f3f633b32a0a9a20.tar.gz yuzu-d52598173d0351e88780abc7f3f633b32a0a9a20.tar.bz2 yuzu-d52598173d0351e88780abc7f3f633b32a0a9a20.tar.lz yuzu-d52598173d0351e88780abc7f3f633b32a0a9a20.tar.xz yuzu-d52598173d0351e88780abc7f3f633b32a0a9a20.tar.zst yuzu-d52598173d0351e88780abc7f3f633b32a0a9a20.zip | |
| -rw-r--r-- | src/video_core/shader/decode/texture.cpp | 8 | ||||
| -rw-r--r-- | src/video_core/shader/shader_ir.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/shader/decode/texture.cpp b/src/video_core/shader/decode/texture.cpp index 0b934a069..295445498 100644 --- a/src/video_core/shader/decode/texture.cpp +++ b/src/video_core/shader/decode/texture.cpp @@ -150,7 +150,7 @@ u32 ShaderIR::DecodeTexture(NodeBlock& bb, u32 pc) { values[element] = Operation(OperationCode::TextureGather, meta, std::move(coords_copy)); } - WriteTexsInstructionFloat(bb, instr, values); + WriteTexsInstructionFloat(bb, instr, values, true); break; } case OpCode::Id::TXQ_B: @@ -344,14 +344,14 @@ void ShaderIR::WriteTexInstructionFloat(NodeBlock& bb, Instruction instr, const } } -void ShaderIR::WriteTexsInstructionFloat(NodeBlock& bb, Instruction instr, - const Node4& components) { +void ShaderIR::WriteTexsInstructionFloat(NodeBlock& bb, Instruction instr, const Node4& components, + bool ignore_mask) { // TEXS has two destination registers and a swizzle. The first two elements in the swizzle // go into gpr0+0 and gpr0+1, and the rest goes into gpr28+0 and gpr28+1 u32 dest_elem = 0; for (u32 component = 0; component < 4; ++component) { - if (!instr.texs.IsComponentEnabled(component)) + if (!instr.texs.IsComponentEnabled(component) && !ignore_mask) continue; SetTemporary(bb, dest_elem++, components[component]); } diff --git a/src/video_core/shader/shader_ir.h b/src/video_core/shader/shader_ir.h index 91cd0a534..02ddf2a75 100644 --- a/src/video_core/shader/shader_ir.h +++ b/src/video_core/shader/shader_ir.h @@ -322,7 +322,7 @@ private: const Node4& components); void WriteTexsInstructionFloat(NodeBlock& bb, Tegra::Shader::Instruction instr, - const Node4& components); + const Node4& components, bool ignore_mask = false); void WriteTexsInstructionHalfFloat(NodeBlock& bb, Tegra::Shader::Instruction instr, const Node4& components); |