diff options
| author | bunnei <bunneidev@gmail.com> | 2018-06-09 05:25:22 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-06-09 05:25:22 +0200 |
| commit | bbc4f369edeab6c21a13fce6146b443445a62c48 (patch) | |
| tree | ac8613849062fe64ed2e8ddd02dbedf5e381ecaa /src/video_core/renderer_opengl/gl_shader_decompiler.cpp | |
| parent | gl_shader_decompiler: Add missing asserts for saturate_a instructions. (diff) | |
| download | yuzu-bbc4f369edeab6c21a13fce6146b443445a62c48.tar yuzu-bbc4f369edeab6c21a13fce6146b443445a62c48.tar.gz yuzu-bbc4f369edeab6c21a13fce6146b443445a62c48.tar.bz2 yuzu-bbc4f369edeab6c21a13fce6146b443445a62c48.tar.lz yuzu-bbc4f369edeab6c21a13fce6146b443445a62c48.tar.xz yuzu-bbc4f369edeab6c21a13fce6146b443445a62c48.tar.zst yuzu-bbc4f369edeab6c21a13fce6146b443445a62c48.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 | 32 |
1 files changed, 26 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 3abdd7fdb..4e248d328 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -992,13 +992,13 @@ private: break; } - case OpCode::Type::ScaledAdd: { + case OpCode::Type::ArithmeticInteger: { std::string op_a = regs.GetRegisterAsInteger(instr.gpr8); - if (instr.iscadd.negate_a) + if (instr.alu_integer.negate_a) op_a = '-' + op_a; - std::string op_b = instr.iscadd.negate_b ? "-" : ""; + std::string op_b = instr.alu_integer.negate_b ? "-" : ""; if (instr.is_b_imm) { op_b += '(' + std::to_string(instr.alu.GetSignedImm20_20()) + ')'; @@ -1011,10 +1011,30 @@ private: } } - std::string shift = std::to_string(instr.iscadd.shift_amount.Value()); + switch (opcode->GetId()) { + case OpCode::Id::IADD_C: + case OpCode::Id::IADD_R: + case OpCode::Id::IADD_IMM: { + ASSERT_MSG(!instr.saturate_a, "Unimplemented"); + regs.SetRegisterToInteger(instr.gpr0, true, 0, op_a + " + " + op_b, 1, 1); + break; + } + case OpCode::Id::ISCADD_C: + case OpCode::Id::ISCADD_R: + case OpCode::Id::ISCADD_IMM: { + 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; + } + default: { + NGLOG_CRITICAL(HW_GPU, "Unhandled ArithmeticInteger instruction: {}", + opcode->GetName()); + UNREACHABLE(); + } + } - regs.SetRegisterToInteger(instr.gpr0, true, 0, - "((" + op_a + " << " + shift + ") + " + op_b + ')', 1, 1); break; } case OpCode::Type::Ffma: { |