diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2016-03-04 21:19:49 -0800 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2016-03-07 14:09:55 -0800 |
commit | af41c0b7e05f8d2b4b01a1a178b2bfa209236bfe (patch) | |
tree | 3f7a9f70210a01c3cb517fda1903dfe968f8762e /src/compiler/glsl/glsl_parser.yy | |
parent | c4960068d5d1b4f882734b0e686092a94c80c9bf (diff) |
glsl: Add function parameters to the parser symbol table.
In a shader such as:
struct S { float f; }
float identity(float S) { return S; }
we would think that "S" in "return S" referred to a structure, even
though it's shadowed by the "float S" parameter in the inner struct.
This led to the parser's grammar seeing TYPE_IDENTIFIER and getting
confused.
Fixes dEQP-GLES2.functional.shaders.scoping.valid.
function_parameter_hides_struct_type_{vertex,fragment}.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Diffstat (limited to 'src/compiler/glsl/glsl_parser.yy')
-rw-r--r-- | src/compiler/glsl/glsl_parser.yy | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index 78a4e5df7cf..5ed051a6705 100644 --- a/src/compiler/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy @@ -894,6 +894,7 @@ parameter_declarator: $$->type->set_location(@1); $$->type->specifier = $1; $$->identifier = $2; + state->symbols->add_variable(new(state) ir_variable(NULL, $2, ir_var_auto)); } | type_specifier any_identifier array_specifier { @@ -905,6 +906,7 @@ parameter_declarator: $$->type->specifier = $1; $$->identifier = $2; $$->array_specifier = $3; + state->symbols->add_variable(new(state) ir_variable(NULL, $2, ir_var_auto)); } ; |