summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-10-03 15:05:40 +0000
committerIan Romanick <idr@us.ibm.com>2005-10-03 15:05:40 +0000
commit8ef0519bbe0318920170e82b6b52853920a897c4 (patch)
tree078e5698b1ef5a9397f87039435f398893a32c2c
parent9a3a1497e5d709015486d0c7801688812ca446da (diff)
Change the 'count' for COMPRESSED_TEXTURE_FORMATS from "?" to "-1". This
signals to the script (glX_proto_size.py) that generates the server-side size functions that a handcoded query is needed to determine the data size. Also do s/FOG_COORD_SOURCE/FOG_COORD_SRC/. When initializing the count in glx_enum::__init__, cast the local property to int. Thanks to Python's dynamic typing, if this isn't done the type of stored count will be a string instead of an int.
-rw-r--r--src/mesa/glapi/glX_XML.py2
-rw-r--r--src/mesa/glapi/gl_API.xml4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/glapi/glX_XML.py b/src/mesa/glapi/glX_XML.py
index e0f07e576e..7cc9d8d664 100644
--- a/src/mesa/glapi/glX_XML.py
+++ b/src/mesa/glapi/glX_XML.py
@@ -59,6 +59,8 @@ class glx_enum(gl_XML.gl_enum):
if not c:
c = self.default_count
+ else:
+ c = int(c)
if m == "get":
mode = 0
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index 41eba87393..4f9d8c474e 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -4115,7 +4115,7 @@
<enum name="NUM_COMPRESSED_TEXTURE_FORMATS" count="1" value="0x86A2">
<size name="Get" mode="get"/>
</enum>
- <enum name="COMPRESSED_TEXTURE_FORMATS" count="?" value="0x86A3">
+ <enum name="COMPRESSED_TEXTURE_FORMATS" count="-1" value="0x86A3">
<size name="Get" mode="get"/>
</enum>
<enum name="CLAMP_TO_BORDER" value="0x812D"/>
@@ -4884,7 +4884,7 @@
<enum name="DYNAMIC_READ" value="0x88E9"/>
<enum name="DYNAMIC_COPY" value="0x88EA"/>
<enum name="SAMPLES_PASSED" count="1" value="0x8914"/>
- <enum name="FOG_COORD_SOURCE" value="0x8450">
+ <enum name="FOG_COORD_SRC" value="0x8450">
<size name="Get" mode="get"/>
</enum>
<enum name="FOG_COORD" value="0x8451"/>