3
0
Fork 0
forked from suyu/suyu

Merge pull request #1489 from FernandoS27/fix-tlds

shader_decompiler: Fix TLDS
This commit is contained in:
bunnei 2018-10-17 18:58:38 -04:00 committed by GitHub
commit 77e2d68df7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2293,6 +2293,8 @@ private:
ASSERT_MSG(!instr.tlds.UsesMiscMode(Tegra::Shader::TextureMiscMode::MZ), ASSERT_MSG(!instr.tlds.UsesMiscMode(Tegra::Shader::TextureMiscMode::MZ),
"MZ is not implemented"); "MZ is not implemented");
u32 op_c_offset = 0;
switch (texture_type) { switch (texture_type) {
case Tegra::Shader::TextureType::Texture1D: { case Tegra::Shader::TextureType::Texture1D: {
const std::string x = regs.GetRegisterAsInteger(instr.gpr8); const std::string x = regs.GetRegisterAsInteger(instr.gpr8);
@ -2307,6 +2309,7 @@ private:
const std::string x = regs.GetRegisterAsInteger(instr.gpr8); const std::string x = regs.GetRegisterAsInteger(instr.gpr8);
const std::string y = regs.GetRegisterAsInteger(instr.gpr20); const std::string y = regs.GetRegisterAsInteger(instr.gpr20);
coord = "ivec2 coords = ivec2(" + x + ", " + y + ");"; coord = "ivec2 coords = ivec2(" + x + ", " + y + ");";
op_c_offset = 1;
} }
break; break;
} }
@ -2318,13 +2321,14 @@ private:
const std::string sampler = const std::string sampler =
GetSampler(instr.sampler, texture_type, is_array, false); GetSampler(instr.sampler, texture_type, is_array, false);
std::string texture = "texelFetch(" + sampler + ", coords, 0)"; std::string texture = "texelFetch(" + sampler + ", coords, 0)";
const std::string op_c = regs.GetRegisterAsInteger(instr.gpr20.Value() + 1);
switch (instr.tlds.GetTextureProcessMode()) { switch (instr.tlds.GetTextureProcessMode()) {
case Tegra::Shader::TextureProcessMode::LZ: { case Tegra::Shader::TextureProcessMode::LZ: {
texture = "texelFetch(" + sampler + ", coords, 0)"; texture = "texelFetch(" + sampler + ", coords, 0)";
break; break;
} }
case Tegra::Shader::TextureProcessMode::LL: { case Tegra::Shader::TextureProcessMode::LL: {
const std::string op_c =
regs.GetRegisterAsInteger(instr.gpr20.Value() + op_c_offset);
texture = "texelFetch(" + sampler + ", coords, " + op_c + ')'; texture = "texelFetch(" + sampler + ", coords, " + op_c + ')';
break; break;
} }