Merge pull request #1027 from bunnei/fix-kil

gl_shader_decompiler: Fix GLSL compiler error with KIL instruction.
2018-08-12 00:25:44 +07:00 · 2018-08-12 00:25:44 +07:00 · 3f81c38c6d
parent a921d22545 c68aa65226
commit 3f81c38c6d
1 changed files with 8 additions and 0 deletions
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@ -1667,7 +1667,15 @@ private:
            }
            case OpCode::Id::KIL: {
                ASSERT(instr.flow.cond == Tegra::Shader::FlowCondition::Always);
+
+                // Enclose "discard" in a conditional, so that GLSL compilation does not complain
+                // about unexecuted instructions that may follow this.
+                shader.AddLine("if (true) {");
+                ++shader.scope;
                shader.AddLine("discard;");
+                --shader.scope;
+                shader.AddLine("}");
+
                break;
            }
            case OpCode::Id::BRA: {