etc/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle RZ cases evaluating the expression instead of the register value.

Browse source
This commit is contained in:
Rodolfo Bogado 2018-12-12 00:34:12 -03:00
parent 7e72b5e453
commit 946777601b
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View file

@ -347,6 +347,15 @@ public:
BuildInputList(); BuildInputList();
} }
void SetConditionalCodesFromExpression(const std::string& expresion) {
SetInternalFlag(InternalFlag::ZeroFlag, "(" + expresion + ") == 0");
LOG_WARNING(HW_GPU, "Condition codes implementation is incomplete.");
}
void SetConditionalCodesFromRegister(const Register& reg, u64 dest_elem = 0) {
SetConditionalCodesFromExpression(GetRegister(reg, static_cast<u32>(dest_elem)));
}
/** /**
* Returns code that does an integer size conversion for the specified size. * Returns code that does an integer size conversion for the specified size.
* @param value Value to perform integer size conversion on. * @param value Value to perform integer size conversion on.
@ -411,10 +420,11 @@ public:
SetRegister(reg, elem, is_saturated ? "clamp(" + value + ", 0.0, 1.0)" : value, SetRegister(reg, elem, is_saturated ? "clamp(" + value + ", 0.0, 1.0)" : value,
dest_num_components, value_num_components, dest_elem, precise); dest_num_components, value_num_components, dest_elem, precise);
if (sets_cc) { if (sets_cc) {
const std::string zero_condition = if (reg == Register::ZeroIndex) {
"( " + GetRegister(reg, static_cast<u32>(dest_elem)) + " == 0 )"; SetConditionalCodesFromExpression(value);
SetInternalFlag(InternalFlag::ZeroFlag, zero_condition); } else {
LOG_WARNING(HW_GPU, "Condition codes implementation is incomplete."); SetConditionalCodesFromRegister(reg, dest_elem);
}
} }
} }
@ -442,10 +452,11 @@ public:
dest_num_components, value_num_components, dest_elem, false); dest_num_components, value_num_components, dest_elem, false);
if (sets_cc) { if (sets_cc) {
const std::string zero_condition = if (reg == Register::ZeroIndex) {
"( " + GetRegister(reg, static_cast<u32>(dest_elem)) + " == 0 )"; SetConditionalCodesFromExpression(value);
SetInternalFlag(InternalFlag::ZeroFlag, zero_condition); } else {
LOG_WARNING(HW_GPU, "Condition codes implementation is incomplete."); SetConditionalCodesFromRegister(reg, dest_elem);
}
} }
} }
@ -3365,14 +3376,11 @@ private:
") " + combiner + " (" + second_pred + "))"; ") " + combiner + " (" + second_pred + "))";
if (instr.fset.bf) { if (instr.fset.bf) {
regs.SetRegisterToFloat(instr.gpr0, 0, predicate + " ? 1.0 : 0.0", 1, 1); regs.SetRegisterToFloat(instr.gpr0, 0, predicate + " ? 1.0 : 0.0", 1, 1, false,
instr.generates_cc);
} else { } else {
regs.SetRegisterToInteger(instr.gpr0, false, 0, predicate + " ? 0xFFFFFFFF : 0", 1, regs.SetRegisterToInteger(instr.gpr0, false, 0, predicate + " ? 0xFFFFFFFF : 0", 1,
1); 1, false, instr.generates_cc);
}
if (instr.generates_cc.Value() != 0) {
regs.SetInternalFlag(InternalFlag::ZeroFlag, predicate);
LOG_WARNING(HW_GPU, "FSET Condition Code is incomplete");
} }
break; break;
} }