aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/get.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-09 13:28:28 +0100
committermarha <marha@users.sourceforge.net>2012-11-09 13:28:28 +0100
commit19b61957dbf473cddbae72792ddeeaee4d4a7077 (patch)
tree0839a8b0cc9c6ea5f3ae63cc34726d4ef936995d /mesalib/src/mesa/main/get.c
parent480a7a0a6c9a8fae5b8fc7b7688173d5e425ae0e (diff)
parent8d57b7fcb22cf1a52203ee57c745b64bba649249 (diff)
downloadvcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.tar.gz
vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.tar.bz2
vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa git update 9 nov 2012
Diffstat (limited to 'mesalib/src/mesa/main/get.c')
-rw-r--r--mesalib/src/mesa/main/get.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index afae08932..39709b808 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -335,6 +335,7 @@ EXTRA_EXT(ARB_blend_func_extended);
EXTRA_EXT(ARB_uniform_buffer_object);
EXTRA_EXT(ARB_timer_query);
EXTRA_EXT(ARB_map_buffer_alignment);
+EXTRA_EXT(ARB_texture_cube_map_array);
static const int
extra_NV_primitive_restart[] = {
@@ -667,6 +668,7 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu
case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
case GL_TEXTURE_BINDING_RECTANGLE_NV:
case GL_TEXTURE_BINDING_EXTERNAL_OES:
+ case GL_TEXTURE_BINDING_CUBE_MAP_ARRAY:
unit = ctx->Texture.CurrentUnit;
v->value_int =
ctx->Texture.Unit[unit].CurrentTex[d->offset]->Name;