diff options
author | marha <marha@users.sourceforge.net> | 2012-01-20 09:35:29 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-01-20 09:35:29 +0100 |
commit | a8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8 (patch) | |
tree | 8bc980551565964e13d046f54ee3876ba2bb7f14 /mesalib/src/mesa/main/texgetimage.c | |
parent | 34c1e86406451a3604de4982339058088434ab40 (diff) | |
download | vcxsrv-a8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8.tar.gz vcxsrv-a8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8.tar.bz2 vcxsrv-a8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8.zip |
xserver xkeyboard-config git update 20 jan 2012
Diffstat (limited to 'mesalib/src/mesa/main/texgetimage.c')
-rw-r--r-- | mesalib/src/mesa/main/texgetimage.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c index f848aa89d..8c85c1e54 100644 --- a/mesalib/src/mesa/main/texgetimage.c +++ b/mesalib/src/mesa/main/texgetimage.c @@ -837,6 +837,9 @@ _mesa_GetnTexImageARB( GLenum target, GLint level, GLenum format, texObj = _mesa_get_current_tex_object(ctx, target); texImage = _mesa_select_tex_image(ctx, texObj, target, level); + if (_mesa_is_zero_size_texture(texImage)) + return; + if (MESA_VERBOSE & (VERBOSE_API | VERBOSE_TEXTURE)) { _mesa_debug(ctx, "glGetTexImage(tex %u) format = %s, w=%d, h=%d," " dstFmt=0x%x, dstType=0x%x\n", @@ -970,6 +973,9 @@ _mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize, texObj = _mesa_get_current_tex_object(ctx, target); texImage = _mesa_select_tex_image(ctx, texObj, target, level); + if (_mesa_is_zero_size_texture(texImage)) + return; + if (MESA_VERBOSE & (VERBOSE_API | VERBOSE_TEXTURE)) { _mesa_debug(ctx, "glGetCompressedTexImage(tex %u) format = %s, w=%d, h=%d\n", |