glsl: Make builtin function profiles for GLSL ES use "es" in the filename.

Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Acked-by: Carl Worth <[email protected]>

4 files changed, 5 insertions, 1 deletions

diff --git a/src/glsl/builtins/profiles/100.frag b/src/glsl/builtins/profiles/100es.frag
index 904aa303c58..904aa303c58 100644
--- a/src/glsl/builtins/profiles/100.frag
+++ b/src/glsl/builtins/profiles/100es.frag
diff --git a/src/glsl/builtins/profiles/100.glsl b/src/glsl/builtins/profiles/100es.glsl
index 0d60a7f3527..0d60a7f3527 100644
--- a/src/glsl/builtins/profiles/100.glsl
+++ b/src/glsl/builtins/profiles/100es.glsl
diff --git a/src/glsl/builtins/profiles/100.vert b/src/glsl/builtins/profiles/100es.vert
index 8f7ea61f7dd..8f7ea61f7dd 100644
--- a/src/glsl/builtins/profiles/100.vert
+++ b/src/glsl/builtins/profiles/100es.vert
diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py
index 3e8d4485580..2cfb1a36e20 100755
--- a/src/glsl/builtins/tools/generate_builtins.py
+++ b/src/glsl/builtins/tools/generate_builtins.py
@@ -279,8 +279,12 @@ _mesa_glsl_initialize_functions(struct _mesa_glsl_parse_state *state)
             check = ''
 
         version = re.sub(r'_(glsl|vert|frag)$', '', profile)
-        if version.isdigit():
+        if version[0].isdigit():
+            is_es = version.endswith('es')
+            if is_es:
+                version = version[:-2]
             check += 'state->language_version == ' + version
+            check += ' && {0}state->es_shader'.format('' if is_es else '!')
         else: # an extension name
             check += 'state->' + version + '_enable'