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 <jordan.l.justen@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jordan Justen 2013-02-19 09:23:51 -08:00
parent 4154ac066f
commit 500b69e797
2 changed files with 3 additions and 0 deletions

View file

@ -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:

View file

@ -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: