summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/common/meta_generate_mipmap.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2014-04-08 13:34:39 -0700
committerEric Anholt <eric@anholt.net>2014-04-15 14:34:22 -0700
commit70961c032fab53ae30a25b95445eae5aaf8c2068 (patch)
tree54da85077fa17856d668fb5d3b19907dfbb6f1f8 /src/mesa/drivers/common/meta_generate_mipmap.c
parentbb3f983d102bf09b8315f50494633bf489721a52 (diff)
downloadexternal_mesa3d-70961c032fab53ae30a25b95445eae5aaf8c2068.zip
external_mesa3d-70961c032fab53ae30a25b95445eae5aaf8c2068.tar.gz
external_mesa3d-70961c032fab53ae30a25b95445eae5aaf8c2068.tar.bz2
meta: Add support for CUBE_MAP_ARRAY to generatemipmap.
I added support to bind_fbo_image in the process of building meta CopyTexSubImage, and found that it broke generatemipmap because previously we would just throw a GL error there and then end up with an incomplete FBO and fallback. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/common/meta_generate_mipmap.c')
-rw-r--r--src/mesa/drivers/common/meta_generate_mipmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/common/meta_generate_mipmap.c b/src/mesa/drivers/common/meta_generate_mipmap.c
index deff690..db46974 100644
--- a/src/mesa/drivers/common/meta_generate_mipmap.c
+++ b/src/mesa/drivers/common/meta_generate_mipmap.c
@@ -189,7 +189,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
*/
if (use_glsl_version) {
_mesa_meta_setup_vertex_objects(&mipmap->VAO, &mipmap->VBO, true,
- 2, 3, 0);
+ 2, 4, 0);
_mesa_meta_setup_blit_shader(ctx, target, &mipmap->shaders);
} else {
_mesa_meta_setup_ff_tnl_for_blit(&mipmap->VAO, &mipmap->VBO, 3);