Mesa (gallium-0.2): Return 0 as the request size when the pixels parameter is NULL
Alan Hourihane
alanh at kemper.freedesktop.org
Mon Dec 15 11:17:00 UTC 2008
Module: Mesa
Branch: gallium-0.2
Commit: 1709ab01ef24279c782e420568e9257b4b92b224
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1709ab01ef24279c782e420568e9257b4b92b224
Author: Neil Roberts <neil at linux.intel.com>
Date: Tue Dec 2 15:03:01 2008 +0000
Return 0 as the request size when the pixels parameter is NULL
img_null_flag was being ignored when calculating the size of a request
so a BadLength error gets thrown for glTexImage3D when the pixels
parameter is NULL.
See bug #11003
---
src/mesa/glapi/glX_proto_size.py | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/mesa/glapi/glX_proto_size.py b/src/mesa/glapi/glX_proto_size.py
index 2b9a643..95cb511 100644
--- a/src/mesa/glapi/glX_proto_size.py
+++ b/src/mesa/glapi/glX_proto_size.py
@@ -581,6 +581,11 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common):
self.common_emit_fixups(fixup)
+ if img.img_null_flag:
+ print ''
+ print ' if (*(CARD32 *) (pc + %s))' % (img.offset - 4)
+ print ' return 0;'
+
print ''
print ' return __glXImageSize(%s, %s, %s, %s, %s, %s,' % (img.img_format, img.img_type, img.img_target, w, h, d )
print ' image_height, row_length, skip_images,'
More information about the mesa-commit
mailing list