diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2018-10-15 20:27:47 +0200 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2018-10-15 20:35:26 +0200 |
| commit | b461342a841f58de2410608e1329db8b518a3656 (patch) | |
| tree | b8075f8ef80f2e5e886fe75ee76e1fa02387dbb8 /src/video_core | |
| parent | gl_rasterizer: Silence implicit cast warning in glBindBufferRange (diff) | |
| download | yuzu-b461342a841f58de2410608e1329db8b518a3656.tar yuzu-b461342a841f58de2410608e1329db8b518a3656.tar.gz yuzu-b461342a841f58de2410608e1329db8b518a3656.tar.bz2 yuzu-b461342a841f58de2410608e1329db8b518a3656.tar.lz yuzu-b461342a841f58de2410608e1329db8b518a3656.tar.xz yuzu-b461342a841f58de2410608e1329db8b518a3656.tar.zst yuzu-b461342a841f58de2410608e1329db8b518a3656.zip | |
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index 8dfb49507..ca063d90d 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -1436,7 +1436,6 @@ private: break; } - case OpCode::Type::Shift: { std::string op_a = regs.GetRegisterAsInteger(instr.gpr8, 0, true); std::string op_b; @@ -1478,7 +1477,6 @@ private: } break; } - case OpCode::Type::ArithmeticIntegerImmediate: { std::string op_a = regs.GetRegisterAsInteger(instr.gpr8); std::string op_b = std::to_string(instr.alu.imm20_32.Value()); @@ -2626,14 +2624,14 @@ private: const std::string pred = GetPredicateCondition(instr.csetp.pred39, instr.csetp.neg_pred39 != 0); const std::string combiner = GetPredicateCombiner(instr.csetp.op); - const std::string controlCode = regs.GetControlCode(instr.csetp.cc); + const std::string control_code = regs.GetControlCode(instr.csetp.cc); if (instr.csetp.pred3 != static_cast<u64>(Pred::UnusedIndex)) { SetPredicate(instr.csetp.pred3, - '(' + controlCode + ") " + combiner + " (" + pred + ')'); + '(' + control_code + ") " + combiner + " (" + pred + ')'); } if (instr.csetp.pred0 != static_cast<u64>(Pred::UnusedIndex)) { SetPredicate(instr.csetp.pred0, - "!(" + controlCode + ") " + combiner + " (" + pred + ')'); + "!(" + control_code + ") " + combiner + " (" + pred + ')'); } break; } |