summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-10-31 02:14:57 +0100
committerFernando Sahmkow <fsahmkow27@gmail.com>2019-10-31 02:14:57 +0100
commit23cabc98db71ff60168bd504f83d7fbe4735e400 (patch)
tree4e206c28928fbda8e4e82ee7c377c6dcb6e992b6 /src/video_core
parentMerge pull request #3050 from FernandoS27/fix-tld4 (diff)
downloadyuzu-23cabc98db71ff60168bd504f83d7fbe4735e400.tar
yuzu-23cabc98db71ff60168bd504f83d7fbe4735e400.tar.gz
yuzu-23cabc98db71ff60168bd504f83d7fbe4735e400.tar.bz2
yuzu-23cabc98db71ff60168bd504f83d7fbe4735e400.tar.lz
yuzu-23cabc98db71ff60168bd504f83d7fbe4735e400.tar.xz
yuzu-23cabc98db71ff60168bd504f83d7fbe4735e400.tar.zst
yuzu-23cabc98db71ff60168bd504f83d7fbe4735e400.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/shader/decode/texture.cpp7
-rw-r--r--src/video_core/shader/shader_ir.h2
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);