From: Ian Romanick <idr@us.ibm.com>
Date: Thu, 14 Apr 2005 23:03:44 +0000 (+0000)
Subject: Convert 'variable_param' from a CDATA attribute to a NMTOKENS attribute.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=067e788acd80b5bb276aa0c1c6d7a67b234990da;p=mesa.git

Convert 'variable_param' from a CDATA attribute to a NMTOKENS attribute.
The main difference is that white-space is used to separate the names
instead of comas.
---

diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index baca5a43521..e583c39e389 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -45,7 +45,7 @@
                    img_send_null       (true | false) "false"
                    img_null_flag       (true | false) "false"
                    img_pad_dimensions  (true | false) "false"
-                   variable_param      CDATA   #IMPLIED>
+                   variable_param      NMTOKENS #IMPLIED>
 <!ATTLIST return   type                CDATA   "void">
 <!ATTLIST glx      rop                 NMTOKEN #IMPLIED
                    sop                 NMTOKEN #IMPLIED
@@ -2801,21 +2801,21 @@ glx:
     <function name="GetMapdv" offset="266">
         <param name="target" type="GLenum"/>
         <param name="query" type="GLenum"/>
-        <param name="v" type="GLdouble *" output="true" variable_param="target, query"/>
+        <param name="v" type="GLdouble *" output="true" variable_param="target query"/>
         <glx sop="120"/>
     </function>
 
     <function name="GetMapfv" offset="267">
         <param name="target" type="GLenum"/>
         <param name="query" type="GLenum"/>
-        <param name="v" type="GLfloat *" output="true" variable_param="target, query"/>
+        <param name="v" type="GLfloat *" output="true" variable_param="target query"/>
         <glx sop="121"/>
     </function>
 
     <function name="GetMapiv" offset="268">
         <param name="target" type="GLenum"/>
         <param name="query" type="GLenum"/>
-        <param name="v" type="GLint *" output="true" variable_param="target, query"/>
+        <param name="v" type="GLint *" output="true" variable_param="target query"/>
         <glx sop="122"/>
     </function>
 
diff --git a/src/mesa/glapi/gl_XML.py b/src/mesa/glapi/gl_XML.py
index 8b7b400d9a4..bb6ec2b54ad 100644
--- a/src/mesa/glapi/gl_XML.py
+++ b/src/mesa/glapi/gl_XML.py
@@ -171,7 +171,7 @@ class glParameter( glItem ):
 
 		temp = attrs.get('variable_param', None)
 		if temp:
-			self.count_parameter_list = temp.replace( ' ', '' ).split( ',' )
+			self.count_parameter_list = temp.split( ' ' )
 		else:
 			self.count_parameter_list = []