summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2018-10-15 15:27:47 -0300
committerGravatar ReinUsesLisp2018-10-15 15:35:26 -0300
commitb461342a841f58de2410608e1329db8b518a3656 (patch)
treeb8075f8ef80f2e5e886fe75ee76e1fa02387dbb8 /src
parentgl_rasterizer: Silence implicit cast warning in glBindBufferRange (diff)
downloadyuzu-b461342a841f58de2410608e1329db8b518a3656.tar.gz
yuzu-b461342a841f58de2410608e1329db8b518a3656.tar.xz
yuzu-b461342a841f58de2410608e1329db8b518a3656.zip
gl_shader_decompiler: Fixup style inconsistencies
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp8
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:
1436 1436
1437 break; 1437 break;
1438 } 1438 }
1439
1440 case OpCode::Type::Shift: { 1439 case OpCode::Type::Shift: {
1441 std::string op_a = regs.GetRegisterAsInteger(instr.gpr8, 0, true); 1440 std::string op_a = regs.GetRegisterAsInteger(instr.gpr8, 0, true);
1442 std::string op_b; 1441 std::string op_b;
@@ -1478,7 +1477,6 @@ private:
1478 } 1477 }
1479 break; 1478 break;
1480 } 1479 }
1481
1482 case OpCode::Type::ArithmeticIntegerImmediate: { 1480 case OpCode::Type::ArithmeticIntegerImmediate: {
1483 std::string op_a = regs.GetRegisterAsInteger(instr.gpr8); 1481 std::string op_a = regs.GetRegisterAsInteger(instr.gpr8);
1484 std::string op_b = std::to_string(instr.alu.imm20_32.Value()); 1482 std::string op_b = std::to_string(instr.alu.imm20_32.Value());
@@ -2626,14 +2624,14 @@ private:
2626 const std::string pred = 2624 const std::string pred =
2627 GetPredicateCondition(instr.csetp.pred39, instr.csetp.neg_pred39 != 0); 2625 GetPredicateCondition(instr.csetp.pred39, instr.csetp.neg_pred39 != 0);
2628 const std::string combiner = GetPredicateCombiner(instr.csetp.op); 2626 const std::string combiner = GetPredicateCombiner(instr.csetp.op);
2629 const std::string controlCode = regs.GetControlCode(instr.csetp.cc); 2627 const std::string control_code = regs.GetControlCode(instr.csetp.cc);
2630 if (instr.csetp.pred3 != static_cast<u64>(Pred::UnusedIndex)) { 2628 if (instr.csetp.pred3 != static_cast<u64>(Pred::UnusedIndex)) {
2631 SetPredicate(instr.csetp.pred3, 2629 SetPredicate(instr.csetp.pred3,
2632 '(' + controlCode + ") " + combiner + " (" + pred + ')'); 2630 '(' + control_code + ") " + combiner + " (" + pred + ')');
2633 } 2631 }
2634 if (instr.csetp.pred0 != static_cast<u64>(Pred::UnusedIndex)) { 2632 if (instr.csetp.pred0 != static_cast<u64>(Pred::UnusedIndex)) {
2635 SetPredicate(instr.csetp.pred0, 2633 SetPredicate(instr.csetp.pred0,
2636 "!(" + controlCode + ") " + combiner + " (" + pred + ')'); 2634 "!(" + control_code + ") " + combiner + " (" + pred + ')');
2637 } 2635 }
2638 break; 2636 break;
2639 } 2637 }