diff options
| author | Eric Anholt <eric@anholt.net> | 2012-03-08 13:49:15 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-03-15 08:33:54 -0700 |
| commit | c5ff9a8b9e3cafb3764e620add2900656c59606b (patch) | |
| tree | a2f52e99c78adbb65191463547f7354f87910170 | |
| parent | ac5a5b324335195b5a5ed98775ce442c573e7e1d (diff) | |
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>
| -rw-r--r-- | src/glsl/builtin_variables.cpp | 6 | ||||
| -rw-r--r-- | src/glsl/glsl_types.cpp | 3 | ||||
| -rw-r--r-- | src/glsl/linker.cpp | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp index 66b3abdd84..26deeebdfc 100644 --- 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 1489aae6d8..a327197048 100644 --- 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 82bddb003c..39169aa10f 100644 --- 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 " |