diff options
| author | Eric Anholt <eric@anholt.net> | 2012-05-14 10:15:52 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-05-17 10:05:24 -0700 |
| commit | 8b7ba92605c0f21cf6292a1bc2e16e379c0b3be8 (patch) | |
| tree | 0c5a56b3f61bea26b0e61b5b4a32d4c4baff7bd9 | |
| parent | aa5ec137757323b424d0f2638c50c93b9b06ffff (diff) | |
mesa: Fix assertion failure when a cube face is not present.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
| -rw-r--r-- | 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 365169dddc..a471bad22b 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) { |