Merge pull request #1200 from bunnei/improve-ipa
gl_shader_decompiler: Improve IPA for Pass mode with Position attribute.
This commit is contained in:
commit
d6accf96ff
2 changed files with 39 additions and 1 deletions
|
@ -242,6 +242,8 @@ enum class TextureType : u64 {
|
||||||
TextureCube = 3,
|
TextureCube = 3,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum class IpaMode : u64 { Pass = 0, None = 1, Constant = 2, Sc = 3 };
|
||||||
|
|
||||||
union Instruction {
|
union Instruction {
|
||||||
Instruction& operator=(const Instruction& instr) {
|
Instruction& operator=(const Instruction& instr) {
|
||||||
value = instr.value;
|
value = instr.value;
|
||||||
|
@ -324,6 +326,10 @@ union Instruction {
|
||||||
}
|
}
|
||||||
} alu;
|
} alu;
|
||||||
|
|
||||||
|
union {
|
||||||
|
BitField<54, 3, IpaMode> mode;
|
||||||
|
} ipa;
|
||||||
|
|
||||||
union {
|
union {
|
||||||
BitField<48, 1, u64> negate_b;
|
BitField<48, 1, u64> negate_b;
|
||||||
} fmul;
|
} fmul;
|
||||||
|
|
|
@ -2100,7 +2100,39 @@ private:
|
||||||
}
|
}
|
||||||
case OpCode::Id::IPA: {
|
case OpCode::Id::IPA: {
|
||||||
const auto& attribute = instr.attribute.fmt28;
|
const auto& attribute = instr.attribute.fmt28;
|
||||||
regs.SetRegisterToInputAttibute(instr.gpr0, attribute.element, attribute.index);
|
const auto& reg = instr.gpr0;
|
||||||
|
switch (instr.ipa.mode) {
|
||||||
|
case Tegra::Shader::IpaMode::Pass:
|
||||||
|
if (stage == Maxwell3D::Regs::ShaderStage::Fragment &&
|
||||||
|
attribute.index == Attribute::Index::Position) {
|
||||||
|
switch (attribute.element) {
|
||||||
|
case 0:
|
||||||
|
shader.AddLine(regs.GetRegisterAsFloat(reg) + " = gl_FragCoord.x;");
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
shader.AddLine(regs.GetRegisterAsFloat(reg) + " = gl_FragCoord.y;");
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
shader.AddLine(regs.GetRegisterAsFloat(reg) + " = gl_FragCoord.z;");
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
shader.AddLine(regs.GetRegisterAsFloat(reg) + " = 1.0;");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
regs.SetRegisterToInputAttibute(reg, attribute.element, attribute.index);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case Tegra::Shader::IpaMode::None:
|
||||||
|
regs.SetRegisterToInputAttibute(reg, attribute.element, attribute.index);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
LOG_CRITICAL(HW_GPU, "Unhandled IPA mode: {}",
|
||||||
|
static_cast<u32>(instr.ipa.mode.Value()));
|
||||||
|
UNREACHABLE();
|
||||||
|
regs.SetRegisterToInputAttibute(reg, attribute.element, attribute.index);
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case OpCode::Id::SSY: {
|
case OpCode::Id::SSY: {
|
||||||
|
|
Loading…
Reference in a new issue