Mesa (map-texture-image-v4): swrast: fix assertions for zero-sized textures

[Brian Paul]

Module: Mesa
Branch: map-texture-image-v4
Commit: 84d1c17d4f25c43bb0acdad3dc61de71a31fbdfc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=84d1c17d4f25c43bb0acdad3dc61de71a31fbdfc

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jul 27 22:23:07 2011 -0600

swrast: fix assertions for zero-sized textures

---

 src/mesa/swrast/s_texture.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index ebc2f88..c4c7113 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -117,8 +117,8 @@ _mesa_check_map_teximage(struct gl_texture_image *texImage,
    if (texImage->TexObject->Target == GL_TEXTURE_1D)
       assert(y == 0 && h == 1);
 
-   assert(x < texImage->Width);
-   assert(y < texImage->Height);
+   assert(x < texImage->Width || texImage->Width == 0);
+   assert(y < texImage->Height || texImage->Height == 0);
    assert(x + w <= texImage->Width);
    assert(y + h <= texImage->Height);
 }