Skip to content

S
swiftshader
Commit f91d9c1c by Nicolas Capens
Options

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: 's avatarShannon Woods <shannonwoods@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent c431041d
Showing with 0 additions and 4 deletions
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();
}
;
......
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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment