summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texstore.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2012-11-03 20:41:08 +1000
committerDave Airlie <airlied@redhat.com>2012-11-09 09:24:41 +1000
commite0e7e29554b7a4a723315eef3df5fb9bad28a70a (patch)
treea76e6c8db2fc06211a64bb066759a0019320f6b4 /src/mesa/main/texstore.c
parent5a5a80e02161f6ec9e36b25699183e0a6d3ad3eb (diff)
downloadexternal_mesa3d-e0e7e29554b7a4a723315eef3df5fb9bad28a70a.zip
external_mesa3d-e0e7e29554b7a4a723315eef3df5fb9bad28a70a.tar.gz
external_mesa3d-e0e7e29554b7a4a723315eef3df5fb9bad28a70a.tar.bz2
mesa: add fbo/texture support for ARB_texture_cube_map_array (v2)
This adds the mesa core + texture + fbo support for the texture cube map array extension. v2: add comment to _mesa_num_tex_faces related to cube map arrays (Brian) drop wrong comment cut-n-paste (Brian) fix / 6 maximum check issue (Kenneth) coalsece some array case statements (Kenneth) Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/mesa/main/texstore.c')
-rw-r--r--src/mesa/main/texstore.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index e691455..1c08810 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -4273,6 +4273,7 @@ store_texsubimage(struct gl_context *ctx,
dims = 1;
break;
case GL_TEXTURE_2D_ARRAY:
+ case GL_TEXTURE_CUBE_MAP_ARRAY:
case GL_TEXTURE_3D:
dims = 3;
break;
@@ -4324,6 +4325,12 @@ store_texsubimage(struct gl_context *ctx,
srcImageStride = _mesa_image_image_stride(packing, width, height,
format, type);
break;
+ case GL_TEXTURE_CUBE_MAP_ARRAY:
+ numSlices = depth;
+ sliceOffset = zoffset;
+ srcImageStride = _mesa_image_image_stride(packing, width, height,
+ format, type);
+ break;
default:
_mesa_warning(ctx, "Unexpected target 0x%x in store_texsubimage()", target);
return;