Fix scoping of function parameters for GLSL ES 1.0

This reverts commit 0637eac3. It's considered a spec bug: https://cvs.khronos.org/bugzilla/show_bug.cgi?id=8656 Change-Id: Id49121d5adf91ecab3d261c3c12e2f879f47e856 Reviewed-on: https://swiftshader-review.googlesource.com/5192Reviewed-by: Shannon Woods <shannonwoods@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>

Fix scoping of function parameters for GLSL ES 1.0
f91d9c1c · Nicolas Capens · c431041d · f91d9c1c · f91d9c1c
Commit f91d9c1c authored Apr 26, 2016 by Nicolas Capens
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

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

No files found.
--- a/src/OpenGL/compiler/glslang.y
+++ b/src/OpenGL/compiler/glslang.y
@@ -1591,11 +1591,9 @@ 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,7 +4831,6 @@ yyreduce:
    {
        context->parseFunctionPrototype((yylsp[0]), (yyvsp[0].interm).function, &(yyvsp[0].interm).intermAggregate);
-        if (context->getShaderVersion() == 100) context->symbolTable.push();
    }
    break;
@@ -4840,7 +4839,6 @@ 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;