summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-07-20 02:32:40 +0200
committerLioncash <mathew1800@gmail.com>2018-07-20 02:32:49 +0200
commitf26866ff6abffbdb447f9ff5467bff242bcec56d (patch)
tree37258e62291277853a961e2891f6d19a346d3195
parentMerge pull request #726 from lioncash/overload (diff)
downloadyuzu-f26866ff6abffbdb447f9ff5467bff242bcec56d.tar
yuzu-f26866ff6abffbdb447f9ff5467bff242bcec56d.tar.gz
yuzu-f26866ff6abffbdb447f9ff5467bff242bcec56d.tar.bz2
yuzu-f26866ff6abffbdb447f9ff5467bff242bcec56d.tar.lz
yuzu-f26866ff6abffbdb447f9ff5467bff242bcec56d.tar.xz
yuzu-f26866ff6abffbdb447f9ff5467bff242bcec56d.tar.zst
yuzu-f26866ff6abffbdb447f9ff5467bff242bcec56d.zip
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 5fae95788..8fdae49ef 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -1405,7 +1405,7 @@ private:
// TEXS has two destination registers. RG goes into gpr0+0 and gpr0+1, and BA
// goes into gpr28+0 and gpr28+1
- size_t offset{};
+ size_t texs_offset{};
for (const auto& dest : {instr.gpr0.Value(), instr.gpr28.Value()}) {
for (unsigned elem = 0; elem < 2; ++elem) {
@@ -1413,7 +1413,8 @@ private:
// Skip disabled components
continue;
}
- regs.SetRegisterToFloat(dest, elem + offset, texture, 1, 4, false, elem);
+ regs.SetRegisterToFloat(dest, elem + texs_offset, texture, 1, 4, false,
+ elem);
}
if (!instr.texs.HasTwoDestinations()) {
@@ -1421,7 +1422,7 @@ private:
break;
}
- offset += 2;
+ texs_offset += 2;
}
--shader.scope;
shader.AddLine("}");
@@ -1463,7 +1464,6 @@ private:
op_b = "abs(" + op_b + ')';
}
- using Tegra::Shader::Pred;
// We can't use the constant predicate as destination.
ASSERT(instr.fsetp.pred3 != static_cast<u64>(Pred::UnusedIndex));
@@ -1500,7 +1500,6 @@ private:
}
}
- using Tegra::Shader::Pred;
// We can't use the constant predicate as destination.
ASSERT(instr.isetp.pred3 != static_cast<u64>(Pred::UnusedIndex));
@@ -1528,7 +1527,6 @@ private:
std::string op_b =
GetPredicateCondition(instr.psetp.pred29, instr.psetp.neg_pred29 != 0);
- using Tegra::Shader::Pred;
// We can't use the constant predicate as destination.
ASSERT(instr.psetp.pred3 != static_cast<u64>(Pred::UnusedIndex));