summaryrefslogtreecommitdiffstats
path: root/src/glsl/builtins/tools
diff options
context:
space:
mode:
authorPaul Berry <[email protected]>2012-08-04 10:43:53 -0700
committerIan Romanick <[email protected]>2012-12-06 12:13:22 -0800
commit4d6d22100abf4512865c316f3ad6a3bd25dd28c1 (patch)
treecf77791c3420c632c7e5b89bd63824b0aa113fca /src/glsl/builtins/tools
parent8dec1bfedd27ae45632b0e08fb5996ff60d042b6 (diff)
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]>
Diffstat (limited to 'src/glsl/builtins/tools')
-rwxr-xr-xsrc/glsl/builtins/tools/generate_builtins.py6
1 files changed, 5 insertions, 1 deletions
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'