From c1ae841f47e05dc084e4961e6a027d6cdb49ace2 Mon Sep 17 00:00:00 2001 From: Subv Date: Thu, 12 Jul 2018 12:00:31 -0500 Subject: GPU: Implement the FADD32I shader instruction. --- src/video_core/engines/shader_bytecode.h | 9 +++++++++ .../renderer_opengl/gl_shader_decompiler.cpp | 23 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index 3b70efeec..b42913121 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h @@ -283,6 +283,13 @@ union Instruction { BitField<56, 1, u64> negate_a; } iadd32i; + union { + BitField<53, 1, u64> negate_b; + BitField<54, 1, u64> abs_a; + BitField<56, 1, u64> negate_a; + BitField<57, 1, u64> abs_b; + } fadd32i; + union { BitField<20, 8, u64> shift_position; BitField<28, 8, u64> shift_length; @@ -473,6 +480,7 @@ public: FADD_C, FADD_R, FADD_IMM, + FADD32I, FMUL_C, FMUL_R, FMUL_IMM, @@ -672,6 +680,7 @@ private: INST("0100110001011---", Id::FADD_C, Type::Arithmetic, "FADD_C"), INST("0101110001011---", Id::FADD_R, Type::Arithmetic, "FADD_R"), INST("0011100-01011---", Id::FADD_IMM, Type::Arithmetic, "FADD_IMM"), + INST("000010----------", Id::FADD32I, Type::ArithmeticImmediate, "FADD32I"), INST("0100110001101---", Id::FMUL_C, Type::Arithmetic, "FMUL_C"), INST("0101110001101---", Id::FMUL_R, Type::Arithmetic, "FMUL_R"), INST("0011100-01101---", Id::FMUL_IMM, Type::Arithmetic, "FMUL_IMM"), diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index e817aca5a..c5d27ec80 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -968,6 +968,29 @@ private: regs.GetRegisterAsFloat(instr.gpr8) + " * " + GetImmediate32(instr), 1, 1); break; } + case OpCode::Id::FADD32I: { + std::string op_a = regs.GetRegisterAsFloat(instr.gpr8); + std::string op_b = GetImmediate32(instr); + + if (instr.fadd32i.abs_a) { + op_a = "abs(" + op_a + ')'; + } + + if (instr.fadd32i.negate_a) { + op_a = "-(" + op_a + ')'; + } + + if (instr.fadd32i.abs_b) { + op_b = "abs(" + op_b + ')'; + } + + if (instr.fadd32i.negate_b) { + op_b = "-(" + op_b + ')'; + } + + regs.SetRegisterToFloat(instr.gpr0, 0, op_a + " + " + op_b, 1, 1); + break; + } } break; } -- cgit v1.2.3