From: Brian Paul <brianp@vmware.com>
Date: Tue, 20 Mar 2012 13:46:47 +0000 (-0600)
Subject: mesa: only test cube face widths in _mesa_test_texobj_completeness()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=75f82b5d580296a27ed026bc257763bfe24cfa60;p=mesa.git

mesa: only test cube face widths in _mesa_test_texobj_completeness()

As Eric pointed out, we know the cube faces are square at this point
so we only need to test the texture widths for consistency.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index d641e40ad72..cfaac64bfd6 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -540,14 +540,17 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
    }
 
    if (t->Target == GL_TEXTURE_CUBE_MAP_ARB) {
-      /* make sure that all six cube map level 0 images are the same size */
-      const GLuint w = baseImage->Width2;
-      const GLuint h = baseImage->Height2;
+      /* Make sure that all six cube map level 0 images are the same size.
+       * Note:  we know that the image's width==height (we enforce that
+       * at glTexImage time) so we only need to test the width here.
+       */
       GLuint face;
+      assert(baseImage->Width2 == baseImage->Height);
       for (face = 1; face < 6; face++) {
+         assert(t->Image[face][baseLevel]->Width2 ==
+                t->Image[face][baseLevel]->Height2);
          if (t->Image[face][baseLevel] == NULL ||
-             t->Image[face][baseLevel]->Width2 != w ||
-             t->Image[face][baseLevel]->Height2 != h) {
+             t->Image[face][baseLevel]->Width2 != baseImage->Width2) {
             incomplete(t, BASE, "Cube face missing or mismatched size");
             return;
          }