fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
This gets a basic #version 140 shader compiling.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2012-03-08 13:49:15 -08:00
parent ac5a5b3243
commit c5ff9a8b9e
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/glsl/builtin_variables.cpp
View file

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

3
src/glsl/glsl_types.cpp
View file

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

2
src/glsl/linker.cpp
View file

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