summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Valle <subv2112@gmail.com>2018-07-13 00:36:51 +0200
committerGitHub <noreply@github.com>2018-07-13 00:36:51 +0200
commit274d1fb0fc3d9397a468f191a0c15afc9c86f94c (patch)
tree4425f3888dc42f05a8db16ce10b736a689075ae5
parentMerge pull request #651 from Subv/ffma_decode (diff)
parentGPU: Implement the FADD32I shader instruction. (diff)
downloadyuzu-274d1fb0fc3d9397a468f191a0c15afc9c86f94c.tar
yuzu-274d1fb0fc3d9397a468f191a0c15afc9c86f94c.tar.gz
yuzu-274d1fb0fc3d9397a468f191a0c15afc9c86f94c.tar.bz2
yuzu-274d1fb0fc3d9397a468f191a0c15afc9c86f94c.tar.lz
yuzu-274d1fb0fc3d9397a468f191a0c15afc9c86f94c.tar.xz
yuzu-274d1fb0fc3d9397a468f191a0c15afc9c86f94c.tar.zst
yuzu-274d1fb0fc3d9397a468f191a0c15afc9c86f94c.zip
-rw-r--r--src/video_core/engines/shader_bytecode.h9
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp23
2 files changed, 32 insertions, 0 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index bdf97e77f..ab978c2e2 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -298,6 +298,13 @@ union Instruction {
} 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;
BitField<48, 1, u64> negate_b;
@@ -487,6 +494,7 @@ public:
FADD_C,
FADD_R,
FADD_IMM,
+ FADD32I,
FMUL_C,
FMUL_R,
FMUL_IMM,
@@ -686,6 +694,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 5914077e8..c29cabb84 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;
}