diff options
author | marha <marha@users.sourceforge.net> | 2012-11-09 13:27:06 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-11-09 13:27:06 +0100 |
commit | 8d57b7fcb22cf1a52203ee57c745b64bba649249 (patch) | |
tree | aaf65faecb30fbffbe7bb11d4bff43ea3297cf2e /mesalib/src/glsl/glsl_types.cpp | |
parent | 1738a6973deb03f33a71c9527594727cb8bb64b4 (diff) | |
download | vcxsrv-8d57b7fcb22cf1a52203ee57c745b64bba649249.tar.gz vcxsrv-8d57b7fcb22cf1a52203ee57c745b64bba649249.tar.bz2 vcxsrv-8d57b7fcb22cf1a52203ee57c745b64bba649249.zip |
mesa git update 9 nov 2012
mesa: 011f8458805e443ac9130865d2840a929a00cabf
Diffstat (limited to 'mesalib/src/glsl/glsl_types.cpp')
-rw-r--r-- | mesalib/src/glsl/glsl_types.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/mesalib/src/glsl/glsl_types.cpp b/mesalib/src/glsl/glsl_types.cpp index 2aa51f0b3..3940a12a5 100644 --- a/mesalib/src/glsl/glsl_types.cpp +++ b/mesalib/src/glsl/glsl_types.cpp @@ -142,7 +142,7 @@ glsl_type::sampler_index() const case GLSL_SAMPLER_DIM_3D: return TEXTURE_3D_INDEX; case GLSL_SAMPLER_DIM_CUBE: - return TEXTURE_CUBE_INDEX; + return (t->sampler_array) ? TEXTURE_CUBE_ARRAY_INDEX : TEXTURE_CUBE_INDEX; case GLSL_SAMPLER_DIM_RECT: return TEXTURE_RECT_INDEX; case GLSL_SAMPLER_DIM_BUF: @@ -256,6 +256,15 @@ glsl_type::generate_OES_EGL_image_external_types(glsl_symbol_table *symtab, } void +glsl_type::generate_ARB_texture_cube_map_array_types(glsl_symbol_table *symtab, + bool warn) +{ + add_types_to_symbol_table(symtab, builtin_ARB_texture_cube_map_array_types, + Elements(builtin_ARB_texture_cube_map_array_types), + warn); +} + +void _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state) { switch (state->language_version) { @@ -304,6 +313,11 @@ _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state) glsl_type::generate_OES_EGL_image_external_types(state->symbols, state->OES_EGL_image_external_warn); } + + if (state->ARB_texture_cube_map_array_enable) { + glsl_type::generate_ARB_texture_cube_map_array_types(state->symbols, + state->ARB_texture_cube_map_array_warn); + } } |