From: Kenneth Graunke <kenneth@whitecape.org>
Date: Sun, 5 Sep 2010 08:51:28 +0000 (-0700)
Subject: glsl: Allow overloading of built-ins without hiding in GLSL ES.
X-Git-Tag: android-x86-2.2~1388
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a98d5a5ac8b61edc14f60836e5a997bb88fc5c80;p=android-x86%2Fexternal-mesa.git

glsl: Allow overloading of built-ins without hiding in GLSL ES.

The rules are explicitly different from desktop GLSL.
---

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);