summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2014-05-07 14:35:42 -0700
committerIan Romanick <ian.d.romanick@intel.com>2014-05-09 18:27:26 -0700
commite120f1a95865c43998ccdd1612ace354d0d8f38f (patch)
tree6b9cee2da0f45623cc3c66437f0b207fd8ee82db
parentcc92276cb8ee26f5e2cfee7c82c7b3860d1e74b3 (diff)
mesa: Fix MaxNumLayers for 1D array textures.
1D array targets store the number of slices in the Height field. Cc: "10.2 10.1 10.0" <mesa-stable@lists.freedesktop.org> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> (cherry picked from commit 5c399ca8e4ccae509a5116b3b9f41634a7ca4322)
-rw-r--r--src/mesa/main/fbobject.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index ca16ae1ec7e..97538bc7b29 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1058,6 +1058,8 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
if (att->Layered) {
if (att_tex_target == GL_TEXTURE_CUBE_MAP)
att_layer_count = 6;
+ else if (att_tex_target == GL_TEXTURE_1D_ARRAY)
+ att_layer_count = att->Renderbuffer->Height;
else
att_layer_count = att->Renderbuffer->Depth;
} else {