From: Ian Romanick Date: Wed, 20 Nov 2013 21:22:05 +0000 (-0800) Subject: mesa: Add missing checks for GL_TEXTURE_CUBE_MAP_ARRAY X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=01bbebce4d7e69867735115890b359c67972e654;p=mesa.git mesa: Add missing checks for GL_TEXTURE_CUBE_MAP_ARRAY That enum requires GL_ARB_texture_cube_map_array, and it is only available on desktop GL. It looks like this has been an un-noticed issue since GL_ARB_texture_cube_map_array support was added in commit e0e7e295. Signed-off-by: Ian Romanick Reviewed-by: Dave Airlie Reviewed-by: Jordan Justen Reviewed-by: Brian Paul --- diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index abd30c56320..c110f504469 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1205,7 +1205,8 @@ target_enum_to_index(struct gl_context *ctx, GLenum target) return _mesa_is_gles(ctx) && ctx->Extensions.OES_EGL_image_external ? TEXTURE_EXTERNAL_INDEX : -1; case GL_TEXTURE_CUBE_MAP_ARRAY: - return TEXTURE_CUBE_ARRAY_INDEX; + return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_cube_map_array + ? TEXTURE_CUBE_ARRAY_INDEX : -1; case GL_TEXTURE_2D_MULTISAMPLE: return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample ? TEXTURE_2D_MULTISAMPLE_INDEX: -1;