diff options
| author | Paul Berry <[email protected]> | 2012-08-01 17:44:02 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-12-06 12:13:21 -0800 |
| commit | 53e572f15cb394a8d4f2cd5856dd2a06b6ccd3f0 (patch) | |
| tree | 4ea5a88d76cc8fff693b00747c3f526d60cea23b /src/glsl/ast_function.cpp | |
| parent | 9a93ba306878693d9157d204743a82becbd5d53e (diff) | |
glsl: Simplify symbol table version checking.
Previously, we stored the GLSL language version in the
glsl_symbol_table struct. But this was unnecessary--all
glsl_symbol_table needs to know is whether functions and variables
have separate namespaces (they do in GLSL 1.10 only).
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Acked-by: Carl Worth <[email protected]>
Diffstat (limited to 'src/glsl/ast_function.cpp')
| -rw-r--r-- | src/glsl/ast_function.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp index ea3282c5f94..c0e05ad8589 100644 --- a/src/glsl/ast_function.cpp +++ b/src/glsl/ast_function.cpp @@ -324,7 +324,8 @@ match_function_by_name(const char *name, goto done; /* no match */ /* Is the function hidden by a variable (impossible in 1.10)? */ - if (state->language_version != 110 && state->symbols->get_variable(name)) + if (!state->symbols->separate_function_namespace + && state->symbols->get_variable(name)) goto done; /* no match */ if (f != NULL) { |