From 3f35fbbf668dab4c1a572f77a0912f4b7c8d857c Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Thu, 17 Mar 2005 01:48:11 +0000
Subject: Fix the handling of zero-sized output parameters (i.e., those with
 type 'GLvoid *').  This fixes the GLX protocol for glGetProgramStringARB. 
 This fixes bugzilla #2747.

Remove the 'ignore="true"' from glVertexAttrib4bvARB.  This fixes bugzilla
#2746.
---
 src/mesa/glapi/glX_proto_send.py | 6 +++++-
 src/mesa/glapi/gl_API.xml        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/mesa/glapi')

diff --git a/src/mesa/glapi/glX_proto_send.py b/src/mesa/glapi/glX_proto_send.py
index a89a5f67eab..7c31b873e2e 100644
--- a/src/mesa/glapi/glX_proto_send.py
+++ b/src/mesa/glapi/glX_proto_send.py
@@ -449,7 +449,11 @@ generic_%u_byte( GLint rop, const void * ptr )
 					print "        __glXReadPixelReply(dpy, gc, %u, %s, %s, %s, %s, %s, %s, GL_FALSE);" % (dim, w, h, d, f.image.img_format, f.image.img_type, f.image.name)
 			else:
 				if f.output != None:
-					output_size = f.output.p_type.size
+					if f.output.p_type.size == 0:
+						output_size = 1
+					else:
+						output_size = f.output.p_type.size
+
 					output_str = f.output.name
 				else:
 					output_size = 0
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index e13815cc10e..4d865af3102 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -5664,7 +5664,7 @@ glx:
     <function name="VertexAttrib4bvARB" offset="654">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLbyte *" count="4"/>
-        <glx rop="4230" ignore="true"/>
+        <glx rop="4230"/>
     </function>
 
     <function name="VertexAttrib4ivARB" offset="655">
-- 
cgit v1.2.3