diff options
author | bunnei <bunneidev@gmail.com> | 2018-06-17 19:26:11 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-06-17 21:27:48 +0200 |
commit | afdd657d307306af27796199b798e7441fb7e21d (patch) | |
tree | 196b3267a4521b1bd0fb103e6e20854705499b35 /src/video_core/renderer_opengl/gl_shader_decompiler.cpp | |
parent | gl_shader_decompiler: Refactor LOP32I instruction a bit in support of LOP. (diff) | |
download | yuzu-afdd657d307306af27796199b798e7441fb7e21d.tar yuzu-afdd657d307306af27796199b798e7441fb7e21d.tar.gz yuzu-afdd657d307306af27796199b798e7441fb7e21d.tar.bz2 yuzu-afdd657d307306af27796199b798e7441fb7e21d.tar.lz yuzu-afdd657d307306af27796199b798e7441fb7e21d.tar.xz yuzu-afdd657d307306af27796199b798e7441fb7e21d.tar.zst yuzu-afdd657d307306af27796199b798e7441fb7e21d.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_shader_decompiler.cpp')
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 34 |
1 files changed, 28 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 b7b49cf72..6ec0a0742 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -1043,12 +1043,7 @@ private: } case OpCode::Type::ArithmeticInteger: { std::string op_a = regs.GetRegisterAsInteger(instr.gpr8); - - if (instr.alu_integer.negate_a) - op_a = '-' + op_a; - - std::string op_b = instr.alu_integer.negate_b ? "-" : ""; - + std::string op_b; if (instr.is_b_imm) { op_b += '(' + std::to_string(instr.alu.GetSignedImm20_20()) + ')'; } else { @@ -1064,6 +1059,12 @@ private: case OpCode::Id::IADD_C: case OpCode::Id::IADD_R: case OpCode::Id::IADD_IMM: { + if (instr.alu_integer.negate_a) + op_a = "-(" + op_a + ')'; + + if (instr.alu_integer.negate_b) + op_b = "-(" + op_b + ')'; + regs.SetRegisterToInteger(instr.gpr0, true, 0, op_a + " + " + op_b, 1, 1, instr.alu.saturate_d); break; @@ -1071,12 +1072,33 @@ private: case OpCode::Id::ISCADD_C: case OpCode::Id::ISCADD_R: case OpCode::Id::ISCADD_IMM: { + if (instr.alu_integer.negate_a) + op_a = "-(" + op_a + ')'; + + if (instr.alu_integer.negate_b) + op_b = "-(" + op_b + ')'; + std::string shift = std::to_string(instr.alu_integer.shift_amount.Value()); regs.SetRegisterToInteger(instr.gpr0, true, 0, "((" + op_a + " << " + shift + ") + " + op_b + ')', 1, 1); break; } + case OpCode::Id::LOP_C: + case OpCode::Id::LOP_R: + case OpCode::Id::LOP_IMM: { + ASSERT_MSG(!instr.alu.lop.unk44, "Unimplemented"); + ASSERT_MSG(instr.alu.lop.pred48 == Pred::UnusedIndex, "Unimplemented"); + + if (instr.alu.lop.invert_a) + op_a = "~(" + op_a + ')'; + + if (instr.alu.lop.invert_b) + op_b = "~(" + op_b + ')'; + + WriteLogicOperation(instr.gpr0, instr.alu.lop.operation, op_a, op_b); + break; + } default: { NGLOG_CRITICAL(HW_GPU, "Unhandled ArithmeticInteger instruction: {}", opcode->GetName()); |