diff options
author | Kenneth Graunke <[email protected]> | 2010-09-05 01:51:28 -0700 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2010-09-07 17:30:39 -0700 |
commit | a98d5a5ac8b61edc14f60836e5a997bb88fc5c80 (patch) | |
tree | 9c095de1727f626c5cdf6d8564ba1b69db7a0d82 /src/glsl/ast_to_hir.cpp | |
parent | f412fac5b46eb274cbed8e62234d5dbfd859f1fe (diff) |
glsl: Allow overloading of built-ins without hiding in GLSL ES.
The rules are explicitly different from desktop GLSL.
Diffstat (limited to 'src/glsl/ast_to_hir.cpp')
-rw-r--r-- | src/glsl/ast_to_hir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index b8a01b8db86..8322dbfdc2c 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -2279,7 +2279,7 @@ ast_function::hir(exec_list *instructions, * that the previously seen signature does not have an associated definition. */ f = state->symbols->get_function(name); - if (f != NULL && !f->has_builtin_signature()) { + if (f != NULL && (state->es_shader || !f->has_builtin_signature())) { sig = f->exact_matching_signature(&hir_parameters); if (sig != NULL) { const char *badvar = sig->qualifiers_match(&hir_parameters); |