From: Brian Paul <brianp@vmware.com>
Date: Tue, 2 Dec 2014 16:41:20 +0000 (-0700)
Subject: mesa: fix height error check for 1D array textures
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4e6244e80f7dd6dad526ff04f5103ed24d61d38a;p=mesa.git

mesa: fix height error check for 1D array textures

height=0 is legal for 1D array textures (as depth=0 is legal for
2D arrays).  Fixes new piglit ext_texture_array-errors test.

Cc: "10.3 10.4" <mesa-stable@lists.freedesktop.org>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 4f4bb11dd5c..7766904c91f 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1542,7 +1542,7 @@ _mesa_legal_texture_dimensions(struct gl_context *ctx, GLenum target,
       maxSize >>= level;
       if (width < 2 * border || width > 2 * border + maxSize)
          return GL_FALSE;
-      if (height < 1 || height > ctx->Const.MaxArrayTextureLayers)
+      if (height < 0 || height > ctx->Const.MaxArrayTextureLayers)
          return GL_FALSE;
       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))