From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 11 Mar 2014 14:02:39 +0000 (+0100)
Subject: mesa: fix texture border handling for cube arrays
X-Git-Tag: upstream/10.3~2979
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55cf320ed87f902d817dfea363e6612be0c3b675;p=platform%2Fupstream%2Fmesa.git

mesa: fix texture border handling for cube arrays

Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index a57a535..57a766f 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1657,7 +1657,10 @@ error_check_subtexture_dimensions(struct gl_context *ctx,
 
    /* check zoffset and depth */
    if (dims > 2) {
-      GLint zBorder = (target == GL_TEXTURE_2D_ARRAY) ? 0 : destImage->Border;
+      GLint zBorder = (target == GL_TEXTURE_2D_ARRAY ||
+                       target == GL_TEXTURE_CUBE_MAP_ARRAY) ?
+                         0 : destImage->Border;
+
       if (zoffset < -zBorder) {
          _mesa_error(ctx, GL_INVALID_VALUE, "%s3D(zoffset)", function);
          return GL_TRUE;