summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texobj.c
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2016-08-18 11:11:04 +0100
committerIan Romanick <ian.d.romanick@intel.com>2016-08-26 15:03:15 -0700
commit87fa462ffd6754144f89163a2692eff005beef9c (patch)
tree8563fe5124dcd47b2da3c8308b77c791e6c5592f /src/mesa/main/texobj.c
parent66b988d09af1a505b428cf2a32c7ee11fb832982 (diff)
downloadexternal_mesa3d-87fa462ffd6754144f89163a2692eff005beef9c.zip
external_mesa3d-87fa462ffd6754144f89163a2692eff005beef9c.tar.gz
external_mesa3d-87fa462ffd6754144f89163a2692eff005beef9c.tar.bz2
mesa: Add and use _mesa_has_texture_cube_map_array helper
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/main/texobj.c')
-rw-r--r--src/mesa/main/texobj.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index b48a980..655627b 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -184,10 +184,10 @@ _mesa_get_current_tex_object(struct gl_context *ctx, GLenum target)
return ctx->Extensions.ARB_texture_cube_map
? ctx->Texture.ProxyTex[TEXTURE_CUBE_INDEX] : NULL;
case GL_TEXTURE_CUBE_MAP_ARRAY:
- return ctx->Extensions.ARB_texture_cube_map_array
+ return _mesa_has_texture_cube_map_array(ctx)
? texUnit->CurrentTex[TEXTURE_CUBE_ARRAY_INDEX] : NULL;
case GL_PROXY_TEXTURE_CUBE_MAP_ARRAY:
- return ctx->Extensions.ARB_texture_cube_map_array
+ return _mesa_has_texture_cube_map_array(ctx)
? ctx->Texture.ProxyTex[TEXTURE_CUBE_ARRAY_INDEX] : NULL;
case GL_TEXTURE_RECTANGLE_NV:
return ctx->Extensions.NV_texture_rectangle