glsl: Hook up the current GLSL 1.30 types and builtins for 1.40.

This gets a basic #version 140 shader compiling.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index 66b3abd..26deeeb 100644 (file)
--- a/src/glsl/builtin_variables.cpp
+++ b/src/glsl/builtin_variables.cpp
@@ -759,6 +759,9 @@ initialize_vs_variables(exec_list *instructions,
    case 130:
       generate_130_vs_variables(instructions, state);
       break;
+   case 140:
+      generate_130_vs_variables(instructions, state);
+      break;
    }
 
    if (state->ARB_draw_instanced_enable)
@@ -985,6 +988,9 @@ initialize_fs_variables(exec_list *instructions,
    case 130:
       generate_130_fs_variables(instructions, state);
       break;
+   case 140:
+      generate_130_fs_variables(instructions, state);
+      break;
    }
 
    if (state->ARB_shader_stencil_export_enable)

diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 1489aae..a327197 100644 (file)
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -257,6 +257,9 @@ _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state)
    case 130:
       glsl_type::generate_130_types(state->symbols);
       break;
+   case 140:
+      glsl_type::generate_130_types(state->symbols);
+      break;
    default:
       /* error */
       break;

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 82bddb0..39169aa 100644 (file)
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -2175,7 +2175,7 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
     * of all shaders must match.
     */
    assert(min_version >= 100);
-   assert(max_version <= 130);
+   assert(max_version <= 140);
    if ((max_version >= 130 || min_version == 100)
        && min_version != max_version) {
       linker_error(prog, "all shaders must use same shading "