Mesa (master): mesa: Fix assertion failure when a cube face is not present.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 8b7ba92605c0f21cf6292a1bc2e16e379c0b3be8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b7ba92605c0f21cf6292a1bc2e16e379c0b3be8

Author: Eric Anholt <eric at anholt.net>
Date:   Mon May 14 10:15:52 2012 -0700

mesa: Fix assertion failure when a cube face is not present.

Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/main/texobj.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 365169d..a471bad 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -558,7 +558,8 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
       GLuint face;
       assert(baseImage->Width2 == baseImage->Height);
       for (face = 1; face < 6; face++) {
-         assert(t->Image[face][baseLevel]->Width2 ==
+         assert(t->Image[face][baseLevel] == NULL ||
+                t->Image[face][baseLevel]->Width2 ==
                 t->Image[face][baseLevel]->Height2);
          if (t->Image[face][baseLevel] == NULL ||
              t->Image[face][baseLevel]->Width2 != baseImage->Width2) {