From: Dave Airlie Date: Wed, 8 Apr 2015 00:59:20 +0000 (+1000) Subject: st/mesa: convert sub image for cube map arrays to 2d arrays for upload X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ed79312ed99f3b141c35569b9767f82f5ba0a93;p=mesa.git st/mesa: convert sub image for cube map arrays to 2d arrays for upload Since we can subimage upload a number of cube map array layers, that aren't a complete cube map array, we should specify things as a 2D array and blit from that. Suggested by Ilia Mirkin as an alternate fix for texsubimage cube map array issues. seems to work just as well. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Marek Olšák Signed-off-by: Dave Airlie --- diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 5c520b44f8d..353f80db1cb 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -738,6 +738,11 @@ st_TexSubImage(struct gl_context *ctx, GLuint dims, if (gl_target == GL_TEXTURE_CUBE_MAP) { gl_target = GL_TEXTURE_2D; } + /* TexSubImage can specify subsets of cube map array faces + * so we need to upload via 2D array instead */ + if (gl_target == GL_TEXTURE_CUBE_MAP_ARRAY) { + gl_target = GL_TEXTURE_2D_ARRAY; + } /* Initialize the source texture description. */ memset(&src_templ, 0, sizeof(src_templ));