diff options
| author | Paul Berry <stereotype441@gmail.com> | 2012-08-04 10:43:53 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-12-06 12:13:22 -0800 |
| commit | 4d6d22100abf4512865c316f3ad6a3bd25dd28c1 (patch) | |
| tree | cf77791c3420c632c7e5b89bd63824b0aa113fca /src/glsl | |
| parent | 8dec1bfedd27ae45632b0e08fb5996ff60d042b6 (diff) | |
glsl: Make builtin function profiles for GLSL ES use "es" in the filename.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Carl Worth <cworth@cworth.org>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/builtins/profiles/100es.frag (renamed from src/glsl/builtins/profiles/100.frag) | 0 | ||||
| -rw-r--r-- | src/glsl/builtins/profiles/100es.glsl (renamed from src/glsl/builtins/profiles/100.glsl) | 0 | ||||
| -rw-r--r-- | src/glsl/builtins/profiles/100es.vert (renamed from src/glsl/builtins/profiles/100.vert) | 0 | ||||
| -rwxr-xr-x | src/glsl/builtins/tools/generate_builtins.py | 6 |
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' |