mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-11-27 09:12:46 +01:00
Merge pull request #1756 from ReinUsesLisp/fix-textures
gl_shader_decompiler: Fix register overwriting on texture calls
This commit is contained in:
bunnei
GitHub
commit
c4b5319446
1 changed files with 78 additions and 60 deletions
|
|
@ -1243,14 +1243,7 @@ private:
|
|||
regs.SetRegisterToInteger(dest, true, 0, result, 1, 1);
|
||||
}
|
||||
|
||||
void WriteTexsInstruction(const Instruction& instr, const std::string& coord,
|
||||
const std::string& texture) {
|
||||
// Add an extra scope and declare the texture coords inside to prevent
|
||||
// overwriting them in case they are used as outputs of the texs instruction.
|
||||
shader.AddLine('{');
|
||||
++shader.scope;
|
||||
shader.AddLine(coord);
|
||||
|
||||
void WriteTexsInstruction(const Instruction& instr, const std::string& texture) {
|
||||
// TEXS has two destination registers and a swizzle. The first two elements in the swizzle
|
||||
// go into gpr0+0 and gpr0+1, and the rest goes into gpr28+0 and gpr28+1
|
||||
|
||||
|
|
@ -1273,9 +1266,6 @@ private:
|
|||
|
||||
++written_components;
|
||||
}
|
||||
|
||||
--shader.scope;
|
||||
shader.AddLine('}');
|
||||
}
|
||||
|
||||
static u32 TextureCoordinates(Tegra::Shader::TextureType texture_type) {
|
||||
|
|
@ -2563,7 +2553,6 @@ private:
|
|||
}
|
||||
// TODO: make sure coordinates are always indexed to gpr8 and gpr20 is always bias
|
||||
// or lod.
|
||||
std::string op_c;
|
||||
|
||||
const std::string sampler =
|
||||
GetSampler(instr.sampler, texture_type, is_array, depth_compare);
|
||||
|
|
@ -2586,27 +2575,35 @@ private:
|
|||
}
|
||||
case Tegra::Shader::TextureProcessMode::LB:
|
||||
case Tegra::Shader::TextureProcessMode::LBA: {
|
||||
const std::string bias = [&]() {
|
||||
if (depth_compare) {
|
||||
if (is_array)
|
||||
op_c = regs.GetRegisterAsFloat(instr.gpr20.Value() + 2);
|
||||
return regs.GetRegisterAsFloat(instr.gpr20.Value() + 2);
|
||||
else
|
||||
op_c = regs.GetRegisterAsFloat(instr.gpr20.Value() + 1);
|
||||
return regs.GetRegisterAsFloat(instr.gpr20.Value() + 1);
|
||||
} else {
|
||||
op_c = regs.GetRegisterAsFloat(instr.gpr20);
|
||||
return regs.GetRegisterAsFloat(instr.gpr20);
|
||||
}
|
||||
}();
|
||||
shader.AddLine("float bias = " + bias + ';');
|
||||
|
||||
// TODO: Figure if A suffix changes the equation at all.
|
||||
texture = "texture(" + sampler + ", coords, " + op_c + ')';
|
||||
texture = "texture(" + sampler + ", coords, bias)";
|
||||
break;
|
||||
}
|
||||
case Tegra::Shader::TextureProcessMode::LL:
|
||||
case Tegra::Shader::TextureProcessMode::LLA: {
|
||||
const std::string lod = [&]() {
|
||||
if (num_coordinates <= 2) {
|
||||
op_c = regs.GetRegisterAsFloat(instr.gpr20);
|
||||
return regs.GetRegisterAsFloat(instr.gpr20);
|
||||
} else {
|
||||
op_c = regs.GetRegisterAsFloat(instr.gpr20.Value() + 1);
|
||||
return regs.GetRegisterAsFloat(instr.gpr20.Value() + 1);
|
||||
}
|
||||
}();
|
||||
shader.AddLine("float lod = " + lod + ';');
|
||||
|
||||
// TODO: Figure if A suffix changes the equation at all.
|
||||
texture = "textureLod(" + sampler + ", coords, " + op_c + ')';
|
||||
texture = "textureLod(" + sampler + ", coords, lod)";
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
|
|
@ -2633,7 +2630,6 @@ private:
|
|||
break;
|
||||
}
|
||||
case OpCode::Id::TEXS: {
|
||||
std::string coord;
|
||||
Tegra::Shader::TextureType texture_type{instr.texs.GetTextureType()};
|
||||
bool is_array{instr.texs.IsArrayTexture()};
|
||||
|
||||
|
|
@ -2646,17 +2642,21 @@ private:
|
|||
if (depth_compare)
|
||||
num_coordinates += 1;
|
||||
|
||||
// Scope to avoid variable name overlaps.
|
||||
shader.AddLine('{');
|
||||
++shader.scope;
|
||||
|
||||
switch (num_coordinates) {
|
||||
case 2: {
|
||||
if (is_array) {
|
||||
const std::string index = regs.GetRegisterAsInteger(instr.gpr8);
|
||||
const std::string x = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1);
|
||||
const std::string y = regs.GetRegisterAsFloat(instr.gpr20);
|
||||
coord = "vec3 coords = vec3(" + x + ", " + y + ", " + index + ");";
|
||||
shader.AddLine("vec3 coords = vec3(" + x + ", " + y + ", " + index + ");");
|
||||
} else {
|
||||
const std::string x = regs.GetRegisterAsFloat(instr.gpr8);
|
||||
const std::string y = regs.GetRegisterAsFloat(instr.gpr20);
|
||||
coord = "vec2 coords = vec2(" + x + ", " + y + ");";
|
||||
shader.AddLine("vec2 coords = vec2(" + x + ", " + y + ");");
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -2666,13 +2666,13 @@ private:
|
|||
const std::string x = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1);
|
||||
const std::string y = regs.GetRegisterAsFloat(instr.gpr8.Value() + 2);
|
||||
const std::string z = regs.GetRegisterAsFloat(instr.gpr20);
|
||||
coord =
|
||||
"vec4 coords = vec4(" + x + ", " + y + ", " + z + ", " + index + ");";
|
||||
shader.AddLine("vec4 coords = vec4(" + x + ", " + y + ", " + z + ", " +
|
||||
index + ");");
|
||||
} else {
|
||||
const std::string x = regs.GetRegisterAsFloat(instr.gpr8);
|
||||
const std::string y = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1);
|
||||
const std::string z = regs.GetRegisterAsFloat(instr.gpr20);
|
||||
coord = "vec3 coords = vec3(" + x + ", " + y + ", " + z + ");";
|
||||
shader.AddLine("vec3 coords = vec3(" + x + ", " + y + ", " + z + ");");
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -2683,7 +2683,7 @@ private:
|
|||
// Fallback to interpreting as a 2D texture for now
|
||||
const std::string x = regs.GetRegisterAsFloat(instr.gpr8);
|
||||
const std::string y = regs.GetRegisterAsFloat(instr.gpr20);
|
||||
coord = "vec2 coords = vec2(" + x + ", " + y + ");";
|
||||
shader.AddLine("vec2 coords = vec2(" + x + ", " + y + ");");
|
||||
texture_type = Tegra::Shader::TextureType::Texture2D;
|
||||
is_array = false;
|
||||
}
|
||||
|
|
@ -2715,14 +2715,16 @@ private:
|
|||
}
|
||||
}
|
||||
if (!depth_compare) {
|
||||
WriteTexsInstruction(instr, coord, texture);
|
||||
WriteTexsInstruction(instr, texture);
|
||||
} else {
|
||||
WriteTexsInstruction(instr, coord, "vec4(" + texture + ')');
|
||||
WriteTexsInstruction(instr, "vec4(" + texture + ')');
|
||||
}
|
||||
|
||||
shader.AddLine('}');
|
||||
--shader.scope;
|
||||
break;
|
||||
}
|
||||
case OpCode::Id::TLDS: {
|
||||
std::string coord;
|
||||
const Tegra::Shader::TextureType texture_type{instr.tlds.GetTextureType()};
|
||||
const bool is_array{instr.tlds.IsArrayTexture()};
|
||||
|
||||
|
|
@ -2736,12 +2738,16 @@ private:
|
|||
UNIMPLEMENTED_IF_MSG(instr.tlds.UsesMiscMode(Tegra::Shader::TextureMiscMode::MZ),
|
||||
"MZ is not implemented");
|
||||
|
||||
u32 op_c_offset = 0;
|
||||
u32 extra_op_offset = 0;
|
||||
|
||||
// Scope to avoid variable name overlaps.
|
||||
shader.AddLine('{');
|
||||
++shader.scope;
|
||||
|
||||
switch (texture_type) {
|
||||
case Tegra::Shader::TextureType::Texture1D: {
|
||||
const std::string x = regs.GetRegisterAsInteger(instr.gpr8);
|
||||
coord = "int coords = " + x + ';';
|
||||
shader.AddLine("int coords = " + x + ';');
|
||||
break;
|
||||
}
|
||||
case Tegra::Shader::TextureType::Texture2D: {
|
||||
|
|
@ -2749,8 +2755,8 @@ private:
|
|||
|
||||
const std::string x = regs.GetRegisterAsInteger(instr.gpr8);
|
||||
const std::string y = regs.GetRegisterAsInteger(instr.gpr20);
|
||||
coord = "ivec2 coords = ivec2(" + x + ", " + y + ");";
|
||||
op_c_offset = 1;
|
||||
shader.AddLine("ivec2 coords = ivec2(" + x + ", " + y + ");");
|
||||
extra_op_offset = 1;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -2765,9 +2771,10 @@ private:
|
|||
break;
|
||||
}
|
||||
case Tegra::Shader::TextureProcessMode::LL: {
|
||||
const std::string op_c =
|
||||
regs.GetRegisterAsInteger(instr.gpr20.Value() + op_c_offset);
|
||||
texture = "texelFetch(" + sampler + ", coords, " + op_c + ')';
|
||||
shader.AddLine(
|
||||
"float lod = " +
|
||||
regs.GetRegisterAsInteger(instr.gpr20.Value() + extra_op_offset) + ';');
|
||||
texture = "texelFetch(" + sampler + ", coords, lod)";
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
|
|
@ -2776,7 +2783,10 @@ private:
|
|||
static_cast<u32>(instr.tlds.GetTextureProcessMode()));
|
||||
}
|
||||
}
|
||||
WriteTexsInstruction(instr, coord, texture);
|
||||
WriteTexsInstruction(instr, texture);
|
||||
|
||||
--shader.scope;
|
||||
shader.AddLine('}');
|
||||
break;
|
||||
}
|
||||
case OpCode::Id::TLD4: {
|
||||
|
|
@ -2799,18 +2809,23 @@ private:
|
|||
if (depth_compare)
|
||||
num_coordinates += 1;
|
||||
|
||||
// Add an extra scope and declare the texture coords inside to prevent
|
||||
// overwriting them in case they are used as outputs of the texs instruction.
|
||||
shader.AddLine('{');
|
||||
++shader.scope;
|
||||
|
||||
switch (num_coordinates) {
|
||||
case 2: {
|
||||
const std::string x = regs.GetRegisterAsFloat(instr.gpr8);
|
||||
const std::string y = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1);
|
||||
coord = "vec2 coords = vec2(" + x + ", " + y + ");";
|
||||
shader.AddLine("vec2 coords = vec2(" + x + ", " + y + ");");
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
const std::string x = regs.GetRegisterAsFloat(instr.gpr8);
|
||||
const std::string y = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1);
|
||||
const std::string z = regs.GetRegisterAsFloat(instr.gpr8.Value() + 2);
|
||||
coord = "vec3 coords = vec3(" + x + ", " + y + ", " + z + ");";
|
||||
shader.AddLine("vec3 coords = vec3(" + x + ", " + y + ", " + z + ");");
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -2818,17 +2833,13 @@ private:
|
|||
static_cast<u32>(num_coordinates));
|
||||
const std::string x = regs.GetRegisterAsFloat(instr.gpr8);
|
||||
const std::string y = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1);
|
||||
coord = "vec2 coords = vec2(" + x + ", " + y + ");";
|
||||
shader.AddLine("vec2 coords = vec2(" + x + ", " + y + ");");
|
||||
texture_type = Tegra::Shader::TextureType::Texture2D;
|
||||
}
|
||||
|
||||
const std::string sampler =
|
||||
GetSampler(instr.sampler, texture_type, false, depth_compare);
|
||||
// Add an extra scope and declare the texture coords inside to prevent
|
||||
// overwriting them in case they are used as outputs of the texs instruction.
|
||||
shader.AddLine("{");
|
||||
++shader.scope;
|
||||
shader.AddLine(coord);
|
||||
|
||||
const std::string texture = "textureGather(" + sampler + ", coords, " +
|
||||
std::to_string(instr.tld4.component) + ')';
|
||||
if (!depth_compare) {
|
||||
|
|
@ -2845,7 +2856,7 @@ private:
|
|||
regs.SetRegisterToFloat(instr.gpr0, 0, texture, 1, 1, false);
|
||||
}
|
||||
--shader.scope;
|
||||
shader.AddLine("}");
|
||||
shader.AddLine('}');
|
||||
break;
|
||||
}
|
||||
case OpCode::Id::TLD4S: {
|
||||
|
|
@ -2856,6 +2867,10 @@ private:
|
|||
instr.tld4s.UsesMiscMode(Tegra::Shader::TextureMiscMode::AOFFI),
|
||||
"AOFFI is not implemented");
|
||||
|
||||
// Scope to avoid variable name overlaps.
|
||||
shader.AddLine('{');
|
||||
++shader.scope;
|
||||
|
||||
const bool depth_compare =
|
||||
instr.tld4s.UsesMiscMode(Tegra::Shader::TextureMiscMode::DC);
|
||||
const std::string op_a = regs.GetRegisterAsFloat(instr.gpr8);
|
||||
|
|
@ -2863,22 +2878,25 @@ private:
|
|||
// TODO(Subv): Figure out how the sampler type is encoded in the TLD4S instruction.
|
||||
const std::string sampler = GetSampler(
|
||||
instr.sampler, Tegra::Shader::TextureType::Texture2D, false, depth_compare);
|
||||
std::string coord;
|
||||
if (!depth_compare) {
|
||||
coord = "vec2 coords = vec2(" + op_a + ", " + op_b + ");";
|
||||
shader.AddLine("vec2 coords = vec2(" + op_a + ", " + op_b + ");");
|
||||
} else {
|
||||
// Note: TLD4S coordinate encoding works just like TEXS's
|
||||
const std::string op_c = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1);
|
||||
coord = "vec3 coords = vec3(" + op_a + ", " + op_c + ", " + op_b + ");";
|
||||
shader.AddLine(
|
||||
"float op_y = " + regs.GetRegisterAsFloat(instr.gpr8.Value() + 1) + ';');
|
||||
shader.AddLine("vec3 coords = vec3(" + op_a + ", op_y, " + op_b + ");");
|
||||
}
|
||||
const std::string texture = "textureGather(" + sampler + ", coords, " +
|
||||
std::to_string(instr.tld4s.component) + ')';
|
||||
|
||||
if (!depth_compare) {
|
||||
WriteTexsInstruction(instr, coord, texture);
|
||||
WriteTexsInstruction(instr, texture);
|
||||
} else {
|
||||
WriteTexsInstruction(instr, coord, "vec4(" + texture + ')');
|
||||
WriteTexsInstruction(instr, "vec4(" + texture + ')');
|
||||
}
|
||||
|
||||
--shader.scope;
|
||||
shader.AddLine('}');
|
||||
break;
|
||||
}
|
||||
case OpCode::Id::TXQ: {
|
||||
|
|
|
|||
Loading…
Reference in a new issue