diff options
author | marha <marha@users.sourceforge.net> | 2011-03-01 07:17:23 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-03-01 07:17:23 +0000 |
commit | a18769801e521ccb5a409c377ac0a6a1141f5776 (patch) | |
tree | cfc3429a80c2f996cb5592512acdebe7719d608c /mesalib/src/glsl/glsl_types.cpp | |
parent | feee2b5ceb37101bd1c4162e49805e6ad63e28ae (diff) | |
download | vcxsrv-a18769801e521ccb5a409c377ac0a6a1141f5776.tar.gz vcxsrv-a18769801e521ccb5a409c377ac0a6a1141f5776.tar.bz2 vcxsrv-a18769801e521ccb5a409c377ac0a6a1141f5776.zip |
pixman mesa git update 1 Mar 2011
Diffstat (limited to 'mesalib/src/glsl/glsl_types.cpp')
-rw-r--r-- | mesalib/src/glsl/glsl_types.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glsl_types.cpp b/mesalib/src/glsl/glsl_types.cpp index 76b4f3e4c..78d10bd93 100644 --- a/mesalib/src/glsl/glsl_types.cpp +++ b/mesalib/src/glsl/glsl_types.cpp @@ -131,6 +131,7 @@ glsl_type::generate_110_types(glsl_symbol_table *symtab) add_types_to_symbol_table(symtab, builtin_110_types, Elements(builtin_110_types), false); + add_types_to_symbol_table(symtab, &_sampler3D_type, 1, false); add_types_to_symbol_table(symtab, builtin_110_deprecated_structure_types, Elements(builtin_110_deprecated_structure_types), false); @@ -179,6 +180,13 @@ glsl_type::generate_EXT_texture_array_types(glsl_symbol_table *symtab, void +glsl_type::generate_OES_texture_3D_types(glsl_symbol_table *symtab, bool warn) +{ + add_types_to_symbol_table(symtab, &_sampler3D_type, 1, warn); +} + + +void _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state) { switch (state->language_version) { @@ -204,6 +212,10 @@ _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state) glsl_type::generate_ARB_texture_rectangle_types(state->symbols, state->ARB_texture_rectangle_warn); } + if (state->OES_texture_3D_enable && state->language_version == 100) { + glsl_type::generate_OES_texture_3D_types(state->symbols, + state->OES_texture_3D_warn); + } if (state->EXT_texture_array_enable && state->language_version < 130) { // These are already included in 130; don't create twice. |