From: Neil Roberts <neil@linux.intel.com>
Date: Tue, 2 Dec 2008 15:03:01 +0000 (+0000)
Subject: Return 0 as the request size when the pixels parameter is NULL
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1709ab01ef24279c782e420568e9257b4b92b224;p=mesa.git

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
---

diff --git a/src/mesa/glapi/glX_proto_size.py b/src/mesa/glapi/glX_proto_size.py
index 2b9a6433622..95cb5110cc3 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,'