diff options
| author | Jordan Justen <[email protected]> | 2013-02-19 09:23:51 -0800 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2013-02-28 21:49:59 -0800 |
| commit | 500b69e7973a8320d76cc7e8a3f1761641bed433 (patch) | |
| tree | 9b75dd70d9ad886fc71e4fa0dc14cac6b917b719 | |
| parent | 4154ac066f2cdeddfe934884b59c8f1ff393545d (diff) | |
glsl: allow GLSL compiler version to be overridden to 1.50
Although GLSL 1.50 compiler support is not available,
this change will allow MESA_GLSL_VERSION_OVERRIDE=150 to be
used while 1.50 support is being developed.
Since no drivers claim 1.50 GLSL support, this change should
only impact Mesa when MESA_GLSL_VERSION_OVERRIDE=150 is set.
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/glsl/builtin_variables.cpp | 2 | ||||
| -rw-r--r-- | src/glsl/glsl_types.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp index ccee7746e55..53c4c51cd14 100644 --- a/src/glsl/builtin_variables.cpp +++ b/src/glsl/builtin_variables.cpp @@ -849,6 +849,7 @@ initialize_vs_variables(exec_list *instructions, generate_130_vs_variables(instructions, state, true); break; case 140: + case 150: generate_130_vs_variables(instructions, state, false); break; default: @@ -1140,6 +1141,7 @@ initialize_fs_variables(exec_list *instructions, generate_130_fs_variables(instructions, state); break; case 140: + case 150: generate_140_fs_variables(instructions, state); break; default: diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index 82aeb84edb4..f78d2a6f8d8 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -373,6 +373,7 @@ _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state) glsl_type::generate_130_types(state->symbols, true, skip_1d); break; case 140: + case 150: glsl_type::generate_140_types(state->symbols); break; default: |