franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shaders: Added decodings for the FSET instructions.

Browse Source
This commit is contained in:
Subv 2018-04-24 22:42:54 -05:00
parent ea3151f475
commit 0369ee7248
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,6 +214,20 @@ union Instruction {
BitField<56, 1, u64> neg_b; BitField<56, 1, u64> neg_b;
} fsetp; } fsetp;
union {
BitField<39, 3, u64> pred39;
BitField<42, 1, u64> neg_pred;
BitField<43, 1, u64> neg_a;
BitField<44, 1, u64> abs_b;
BitField<45, 2, PredOperation> op;
BitField<48, 4, PredCondition> cond;
BitField<53, 1, u64> neg_b;
BitField<54, 1, u64> abs_a;
BitField<52, 1, u64> bf;
BitField<55, 1, u64> ftz;
BitField<56, 1, u64> neg_imm;
} fset;
BitField<61, 1, u64> is_b_imm; BitField<61, 1, u64> is_b_imm;
BitField<60, 1, u64> is_b_gpr; BitField<60, 1, u64> is_b_gpr;
BitField<59, 1, u64> is_c_gpr; BitField<59, 1, u64> is_c_gpr;
@ -272,6 +286,9 @@ public:
FSETP_C, // Set Predicate FSETP_C, // Set Predicate
FSETP_R, FSETP_R,
FSETP_IMM, FSETP_IMM,
FSET_C,
FSET_R,
FSET_IMM,
ISETP_C, ISETP_C,
ISETP_IMM, ISETP_IMM,
ISETP_R, ISETP_R,
@ -283,8 +300,9 @@ public:
Ffma, Ffma,
Flow, Flow,
Memory, Memory,
FloatPredicate, FloatSet,
IntegerPredicate, FloatSetPredicate,
IntegerSetPredicate,
Unknown, Unknown,
}; };
@ -417,12 +435,15 @@ private:
INST("0100110000101---", Id::SHR_C, Type::Arithmetic, "SHR_C"), INST("0100110000101---", Id::SHR_C, Type::Arithmetic, "SHR_C"),
INST("0101110000101---", Id::SHR_R, Type::Arithmetic, "SHR_R"), INST("0101110000101---", Id::SHR_R, Type::Arithmetic, "SHR_R"),
INST("0011100-00101---", Id::SHR_IMM, Type::Arithmetic, "SHR_IMM"), INST("0011100-00101---", Id::SHR_IMM, Type::Arithmetic, "SHR_IMM"),
INST("010010111011----", Id::FSETP_C, Type::FloatPredicate, "FSETP_C"), INST("01011000--------", Id::FSET_R, Type::FloatSet, "FSET_R"),
INST("010110111011----", Id::FSETP_R, Type::FloatPredicate, "FSETP_R"), INST("0100100---------", Id::FSET_C, Type::FloatSet, "FSET_C"),
INST("0011011-1011----", Id::FSETP_IMM, Type::FloatPredicate, "FSETP_IMM"), INST("0011000---------", Id::FSET_IMM, Type::FloatSet, "FSET_IMM"),
INST("010010110110----", Id::ISETP_C, Type::IntegerPredicate, "ISETP_C"), INST("010010111011----", Id::FSETP_C, Type::FloatSetPredicate, "FSETP_C"),
INST("010110110110----", Id::ISETP_R, Type::IntegerPredicate, "ISETP_R"), INST("010110111011----", Id::FSETP_R, Type::FloatSetPredicate, "FSETP_R"),
INST("0011011-0110----", Id::ISETP_IMM, Type::IntegerPredicate, "ISETP_IMM"), INST("0011011-1011----", Id::FSETP_IMM, Type::FloatSetPredicate, "FSETP_IMM"),
INST("010010110110----", Id::ISETP_C, Type::IntegerSetPredicate, "ISETP_C"),
INST("010110110110----", Id::ISETP_R, Type::IntegerSetPredicate, "ISETP_R"),
INST("0011011-0110----", Id::ISETP_IMM, Type::IntegerSetPredicate, "ISETP_IMM"),
}; };
#undef INST #undef INST
std::stable_sort(table.begin(), table.end(), [](const auto& a, const auto& b) { std::stable_sort(table.begin(), table.end(), [](const auto& a, const auto& b) {

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

@ -519,7 +519,7 @@ private:
} }
break; break;
} }
case OpCode::Type::FloatPredicate: { case OpCode::Type::FloatSetPredicate: {
std::string op_a = instr.fsetp.neg_a ? "-" : ""; std::string op_a = instr.fsetp.neg_a ? "-" : "";
op_a += GetRegister(instr.gpr8); op_a += GetRegister(instr.gpr8);