Fix local variable hides function parameter for GLSL ES 1.0

GLSL ES 1.0 specifies that "a function body has a scope nested inside the function’s definition". For GLSL ES 3.0, they form a single scope. Both specs use the compound_statement_no_new_scope rule. This change respects that while supporting both behaviors. It does not impact legacy content since it makes things more permissive. Change-Id: Ica40fbf4d24d441ca2288fe5d43c288161e16b89 Reviewed-on: https://swiftshader-review.googlesource.com/5055Tested-by: Nicolas Capens <capn@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Fix local variable hides function parameter for GLSL ES 1.0
0637eac3 · Nicolas Capens · 85c4f9e0 · 0637eac3 · 0637eac3
Commit 0637eac3 authored Apr 07, 2016 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

glslang.y src/OpenGL/compiler/glslang.y +2 -0

glslang_tab.cpp src/OpenGL/compiler/glslang_tab.cpp +2 -0

No files found.
--- a/src/OpenGL/compiler/glslang.y
+++ b/src/OpenGL/compiler/glslang.y
@@ -1591,9 +1591,11 @@ external_declaration
 function_definition
    : function_prototype {
        context->parseFunctionPrototype(@1, $1.function, &$1.intermAggregate);
+        if (context->getShaderVersion() == 100) context->symbolTable.push();
    }
    compound_statement_no_new_scope {
        $$ = context->addFunctionDefinition(*($1.function), $1.intermAggregate, $3, @1);
+        if (context->getShaderVersion() == 100) context->symbolTable.pop();
    }
    ;

--- a/src/OpenGL/compiler/glslang_tab.cpp
+++ b/src/OpenGL/compiler/glslang_tab.cpp
@@ -4831,6 +4831,7 @@ yyreduce:
    {
        context->parseFunctionPrototype((yylsp[0]), (yyvsp[0].interm).function, &(yyvsp[0].interm).intermAggregate);
+        if (context->getShaderVersion() == 100) context->symbolTable.push();
    }
    break;
@@ -4839,6 +4840,7 @@ yyreduce:
    {
        (yyval.interm.intermNode) = context->addFunctionDefinition(*((yyvsp[-2].interm).function), (yyvsp[-2].interm).intermAggregate, (yyvsp[0].interm.intermAggregate), (yylsp[-2]));
+        if (context->getShaderVersion() == 100) context->symbolTable.pop();
    }
    break;