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>

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index ccee7746e55cf04b6b3d70addbd4c322b60e623e..53c4c51cd143db81820310edf021fce82e37513a 100644 (file)
--- 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 82aeb84edb4304a69956dd38b017c111cef4ddd0..f78d2a6f8d8cae10552366309a5504f20e54916c 100644 (file)
--- 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: