aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/builtin_types.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-09 13:27:06 +0100
committermarha <marha@users.sourceforge.net>2012-11-09 13:27:06 +0100
commit8d57b7fcb22cf1a52203ee57c745b64bba649249 (patch)
treeaaf65faecb30fbffbe7bb11d4bff43ea3297cf2e /mesalib/src/glsl/builtin_types.h
parent1738a6973deb03f33a71c9527594727cb8bb64b4 (diff)
downloadvcxsrv-8d57b7fcb22cf1a52203ee57c745b64bba649249.tar.gz
vcxsrv-8d57b7fcb22cf1a52203ee57c745b64bba649249.tar.bz2
vcxsrv-8d57b7fcb22cf1a52203ee57c745b64bba649249.zip
mesa git update 9 nov 2012
mesa: 011f8458805e443ac9130865d2840a929a00cabf
Diffstat (limited to 'mesalib/src/glsl/builtin_types.h')
-rw-r--r--mesalib/src/glsl/builtin_types.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/mesalib/src/glsl/builtin_types.h b/mesalib/src/glsl/builtin_types.h
index d75c56261..92427d8e7 100644
--- a/mesalib/src/glsl/builtin_types.h
+++ b/mesalib/src/glsl/builtin_types.h
@@ -327,3 +327,18 @@ const glsl_type glsl_type::builtin_OES_EGL_image_external_types[] = {
GLSL_SAMPLER_DIM_EXTERNAL, 0, 0, GLSL_TYPE_FLOAT, "samplerExternalOES"),
};
/*@}*/
+
+/** \name Sampler types added by GL_ARB_texture_cube_map_array
+ */
+/*@{*/
+const glsl_type glsl_type::builtin_ARB_texture_cube_map_array_types[] = {
+ glsl_type(GL_SAMPLER_CUBE_MAP_ARRAY,
+ GLSL_SAMPLER_DIM_CUBE, 0, 1, GLSL_TYPE_FLOAT, "samplerCubeArray"),
+ glsl_type(GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW,
+ GLSL_SAMPLER_DIM_CUBE, 1, 1, GLSL_TYPE_FLOAT, "samplerCubeArrayShadow"),
+ glsl_type(GL_INT_SAMPLER_CUBE_MAP_ARRAY,
+ GLSL_SAMPLER_DIM_CUBE, 0, 1, GLSL_TYPE_INT, "isamplerCubeArray"),
+ glsl_type(GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY,
+ GLSL_SAMPLER_DIM_CUBE, 0, 1, GLSL_TYPE_UINT, "usamplerCubeArray"),
+};
+/*@}*/