yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

ShaderGen: Fixed a case where the TEXS instruction would use the same registers for the input and the output. 

It will now save the coords before writing the outputs in a subscope.
This commit is contained in:
Subv 2018-04-19 13:33:17 -05:00
parent d019bb16f6
commit 5367935d35
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,11 +399,18 @@ private:
const std::string op_a = GetRegister(instr.gpr8); const std::string op_a = GetRegister(instr.gpr8);
const std::string op_b = GetRegister(instr.gpr20); const std::string op_b = GetRegister(instr.gpr20);
const std::string sampler = GetSampler(instr.sampler); const std::string sampler = GetSampler(instr.sampler);
const std::string coord = "vec2(" + op_a + ", " + op_b + ")"; const std::string coord = "vec2 coords = vec2(" + op_a + ", " + op_b + ");";
const std::string texture = "texture(" + sampler + ", " + coord + ")"; // 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 = "texture(" + sampler + ", coords)";
for (unsigned elem = 0; elem < instr.attribute.fmt20.size; ++elem) { for (unsigned elem = 0; elem < instr.attribute.fmt20.size; ++elem) {
SetDest(elem, GetRegister(instr.gpr0, elem), texture, 1, 4); SetDest(elem, GetRegister(instr.gpr0, elem), texture, 1, 4);
} }
--shader.scope;
shader.AddLine("}");
break; break;
} }
default: { default: {