diff options
author | bunnei <bunneidev@gmail.com> | 2018-07-20 18:13:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-20 18:13:36 +0200 |
commit | 204d707ce74f27b29dc5a8de8bec11b3578b8e4e (patch) | |
tree | bff532c1f19873b451fc808e9f4b4f7c0e9f8be6 | |
parent | Merge pull request #730 from lioncash/string (diff) | |
parent | gl_shader_decompiler: Eliminate variable and declaration shadowing (diff) | |
download | yuzu-204d707ce74f27b29dc5a8de8bec11b3578b8e4e.tar yuzu-204d707ce74f27b29dc5a8de8bec11b3578b8e4e.tar.gz yuzu-204d707ce74f27b29dc5a8de8bec11b3578b8e4e.tar.bz2 yuzu-204d707ce74f27b29dc5a8de8bec11b3578b8e4e.tar.lz yuzu-204d707ce74f27b29dc5a8de8bec11b3578b8e4e.tar.xz yuzu-204d707ce74f27b29dc5a8de8bec11b3578b8e4e.tar.zst yuzu-204d707ce74f27b29dc5a8de8bec11b3578b8e4e.zip |
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 10 |
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 9b308b923..a1ac18a71 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)); |