yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #652 from Subv/fadd32i 

GPU: Implement the FADD32I shader instruction.
This commit is contained in:
Sebastian Valle 2018-07-12 17:36:51 -05:00 committed by GitHub
parent 3ff21345b4 c1ae841f47
commit 274d1fb0fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/video_core/engines/shader_bytecode.h
View File

@ -297,6 +297,13 @@ union Instruction {
BitField<56, 1, u64> negate_a; BitField<56, 1, u64> negate_a;
} iadd32i; } 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 { union {
BitField<20, 8, u64> shift_position; BitField<20, 8, u64> shift_position;
BitField<28, 8, u64> shift_length; BitField<28, 8, u64> shift_length;
@ -487,6 +494,7 @@ public:
FADD_C, FADD_C,
FADD_R, FADD_R,
FADD_IMM, FADD_IMM,
FADD32I,
FMUL_C, FMUL_C,
FMUL_R, FMUL_R,
FMUL_IMM, FMUL_IMM,
@ -686,6 +694,7 @@ private:
INST("0100110001011---", Id::FADD_C, Type::Arithmetic, "FADD_C"), INST("0100110001011---", Id::FADD_C, Type::Arithmetic, "FADD_C"),
INST("0101110001011---", Id::FADD_R, Type::Arithmetic, "FADD_R"), INST("0101110001011---", Id::FADD_R, Type::Arithmetic, "FADD_R"),
INST("0011100-01011---", Id::FADD_IMM, Type::Arithmetic, "FADD_IMM"), 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("0100110001101---", Id::FMUL_C, Type::Arithmetic, "FMUL_C"),
INST("0101110001101---", Id::FMUL_R, Type::Arithmetic, "FMUL_R"), INST("0101110001101---", Id::FMUL_R, Type::Arithmetic, "FMUL_R"),
INST("0011100-01101---", Id::FMUL_IMM, Type::Arithmetic, "FMUL_IMM"), INST("0011100-01101---", Id::FMUL_IMM, Type::Arithmetic, "FMUL_IMM"),

23
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View File

@ -968,6 +968,29 @@ private:
regs.GetRegisterAsFloat(instr.gpr8) + " * " + GetImmediate32(instr), 1, 1); regs.GetRegisterAsFloat(instr.gpr8) + " * " + GetImmediate32(instr), 1, 1);
break; 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; break;
} }