glGetTexImage, for example, has no width/height/depth parameters.
Also, copy some missing parameter info from the original versions
of certain functions over to their ARB_robustness counterparts.
---
src/mapi/glapi/gen/ARB_robustness.xml | 26 +++++++++++++-------------
src/mapi/glapi/gen/gl_API.xml | 16 ++++++++--------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/mapi/glapi/gen/ARB_robustness.xml
b/src/mapi/glapi/gen/ARB_robustness.xml
index b347ef3..49444c5 100644
--- a/src/mapi/glapi/gen/ARB_robustness.xml
+++ b/src/mapi/glapi/gen/ARB_robustness.xml
@@ -29,21 +29,21 @@
<param name="target" type="GLenum"/>
<param name="query" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="v" type="GLdouble *" output="true"/>
+ <param name="v" type="GLdouble *" output="true"
variable_param="target query"/>
</function>
<function name="GetnMapfvARB" offset="assign">
<param name="target" type="GLenum"/>
<param name="query" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="v" type="GLfloat *" output="true"/>
+ <param name="v" type="GLfloat *" output="true"
variable_param="target query"/>
</function>
<function name="GetnMapivARB" offset="assign">
<param name="target" type="GLenum"/>
<param name="query" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="v" type="GLint *" output="true"/>
+ <param name="v" type="GLint *" output="true"
variable_param="target query"/>
</function>
@@ -51,26 +51,26 @@
<function name="GetnPixelMapfvARB" offset="assign">
<param name="map" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="values" type="GLfloat *" output="true"/>
+ <param name="values" type="GLfloat *" output="true"
variable_param="map"/>
</function>
<function name="GetnPixelMapuivARB" offset="assign">
<param name="map" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="values" type="GLuint *" output="true"/>
+ <param name="values" type="GLuint *" output="true"
variable_param="map"/>
</function>
<function name="GetnPixelMapusvARB" offset="assign">
<param name="map" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="values" type="GLushort *" output="true"/>
+ <param name="values" type="GLushort *" output="true"
variable_param="map"/>
</function>
<function name="GetnPolygonStippleARB" offset="assign">
<param name="bufSize" type="GLsizei"/>
- <param name="pattern" type="GLubyte *" output="true"/>
+ <param name="pattern" type="GLubyte *" output="true"
img_width="32" img_height="32" img_format="GL_COLOR_INDEX"
img_type="GL_BITMAP"/>
</function>
<function name="GetnTexImageARB" offset="assign">
@@ -79,7 +79,7 @@
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="img" type="GLvoid *" output="true"/>
+ <param name="img" type="GLvoid *" output="true"
img_format="format" img_type="type"/>
</function>
<function name="ReadnPixelsARB" offset="assign">
@@ -90,7 +90,7 @@
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="data" type="GLvoid *" output="true"/>
+ <param name="data" type="GLvoid *" output="true"
img_width="width" img_height="height" img_format="format"
img_type="type" img_target="0"/>
</function>
@@ -100,7 +100,7 @@
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="table" type="GLvoid *" output="true"/>
+ <param name="table" type="GLvoid *" output="true"
img_format="format" img_type="type"/>
</function>
<function name="GetnConvolutionFilterARB" offset="assign">
@@ -108,7 +108,7 @@
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="image" type="GLvoid *" output="true"/>
+ <param name="image" type="GLvoid *" output="true"
img_format="format" img_type="type"/>
</function>
<function name="GetnSeparableFilterARB" offset="assign">
@@ -128,7 +128,7 @@
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="values" type="GLvoid *" output="true"/>
+ <param name="values" type="GLvoid *" output="true"
img_format="format" img_type="type"/>
</function>
<function name="GetnMinmaxARB" offset="assign">
@@ -137,7 +137,7 @@
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="values" type="GLvoid *" output="true"/>
+ <param name="values" type="GLvoid *" output="true"
img_width="2" img_format="format" img_type="type"/>
</function>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 669be60..a6f8dd0 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2788,7 +2788,7 @@
<param name="level" type="GLint"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="pixels" type="GLvoid *" output="true"
img_width="width" img_height="height" img_depth="depth"
img_format="format" img_type="type"/>
+ <param name="pixels" type="GLvoid *" output="true"
img_format="format" img_type="type"/>
<glx sop="135" dimensions_in_reply="true"/>
</function>
@@ -3754,7 +3754,7 @@
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="table" type="GLvoid *" output="true"
img_width="width" img_format="format" img_type="type"/>
+ <param name="table" type="GLvoid *" output="true"
img_format="format" img_type="type"/>
<glx sop="147" dimensions_in_reply="true"/>
</function>
@@ -3863,7 +3863,7 @@
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="image" type="GLvoid *" output="true"
img_width="width" img_height="height" img_format="format"
img_type="type"/>
+ <param name="image" type="GLvoid *" output="true"
img_format="format" img_type="type"/>
<glx sop="150" dimensions_in_reply="true"/>
</function>
@@ -3908,7 +3908,7 @@
<param name="reset" type="GLboolean"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="values" type="GLvoid *" output="true"
img_width="width" img_format="format" img_type="type"/>
+ <param name="values" type="GLvoid *" output="true"
img_format="format" img_type="type"/>
<glx sop="154" dimensions_in_reply="true" img_reset="reset"/>
</function>
@@ -8259,7 +8259,7 @@
<param name="reset" type="GLboolean"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="values" type="GLvoid *" output="true"
img_width="width" img_format="format" img_type="type"/>
+ <param name="values" type="GLvoid *" output="true"
img_format="format" img_type="type"/>
<glx vendorpriv="5" dimensions_in_reply="true" img_reset="reset"/>
</function>
@@ -8453,7 +8453,7 @@
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="image" type="GLvoid *" output="true"
img_width="width" img_height="height" img_format="format"
img_type="type"/>
+ <param name="image" type="GLvoid *" output="true"
img_format="format" img_type="type"/>
<glx vendorpriv="1" dimensions_in_reply="true"/>
</function>
@@ -8586,7 +8586,7 @@
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="table" type="GLvoid *" output="true"
img_width="width" img_format="format" img_type="type"/>
+ <param name="table" type="GLvoid *" output="true"
img_format="format" img_type="type"/>
<glx vendorpriv="4098" dimensions_in_reply="true"/>
</function>
@@ -9244,7 +9244,7 @@
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="table" type="GLvoid *" output="true"
img_width="width" img_format="format" img_type="type"/>
+ <param name="table" type="GLvoid *" output="true"
img_format="format" img_type="type"/>
<glx vendorpriv="4098" dimensions_in_reply="true"/>
</function>
--
1.7.0.4
From db4bcc73e97988dcea7e8fa4ca2c1b0b535cd639 Mon Sep 17 00:00:00 2001
From: nobled <nob...@dreamwidth.org>
Date: Sun, 1 May 2011 12:10:50 +0000
Subject: [PATCH 1/5] glapi: remove non-existent parameter references
glGetTexImage, for example, has no width/height/depth parameters.
Also, copy some missing parameter info from the original versions
of certain functions over to their ARB_robustness counterparts.
---
src/mapi/glapi/gen/ARB_robustness.xml | 26 +++++++++++++-------------
src/mapi/glapi/gen/gl_API.xml | 16 ++++++++--------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/mapi/glapi/gen/ARB_robustness.xml
b/src/mapi/glapi/gen/ARB_robustness.xml
index b347ef3..49444c5 100644
--- a/src/mapi/glapi/gen/ARB_robustness.xml
+++ b/src/mapi/glapi/gen/ARB_robustness.xml
@@ -29,21 +29,21 @@
<param name="target" type="GLenum"/>
<param name="query" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="v" type="GLdouble *" output="true"/>
+ <param name="v" type="GLdouble *" output="true" variable_param="target
query"/>
</function>
<function name="GetnMapfvARB" offset="assign">
<param name="target" type="GLenum"/>
<param name="query" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="v" type="GLfloat *" output="true"/>
+ <param name="v" type="GLfloat *" output="true" variable_param="target
query"/>
</function>
<function name="GetnMapivARB" offset="assign">
<param name="target" type="GLenum"/>
<param name="query" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="v" type="GLint *" output="true"/>
+ <param name="v" type="GLint *" output="true" variable_param="target
query"/>
</function>
@@ -51,26 +51,26 @@
<function name="GetnPixelMapfvARB" offset="assign">
<param name="map" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="values" type="GLfloat *" output="true"/>
+ <param name="values" type="GLfloat *" output="true"
variable_param="map"/>
</function>
<function name="GetnPixelMapuivARB" offset="assign">
<param name="map" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="values" type="GLuint *" output="true"/>
+ <param name="values" type="GLuint *" output="true"
variable_param="map"/>
</function>
<function name="GetnPixelMapusvARB" offset="assign">
<param name="map" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="values" type="GLushort *" output="true"/>
+ <param name="values" type="GLushort *" output="true"
variable_param="map"/>
</function>
<function name="GetnPolygonStippleARB" offset="assign">
<param name="bufSize" type="GLsizei"/>
- <param name="pattern" type="GLubyte *" output="true"/>
+ <param name="pattern" type="GLubyte *" output="true" img_width="32"
img_height="32" img_format="GL_COLOR_INDEX" img_type="GL_BITMAP"/>
</function>
<function name="GetnTexImageARB" offset="assign">
@@ -79,7 +79,7 @@
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="img" type="GLvoid *" output="true"/>
+ <param name="img" type="GLvoid *" output="true" img_format="format"
img_type="type"/>
</function>
<function name="ReadnPixelsARB" offset="assign">
@@ -90,7 +90,7 @@
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="data" type="GLvoid *" output="true"/>
+ <param name="data" type="GLvoid *" output="true" img_width="width"
img_height="height" img_format="format" img_type="type" img_target="0"/>
</function>
@@ -100,7 +100,7 @@
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="table" type="GLvoid *" output="true"/>
+ <param name="table" type="GLvoid *" output="true" img_format="format"
img_type="type"/>
</function>
<function name="GetnConvolutionFilterARB" offset="assign">
@@ -108,7 +108,7 @@
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="image" type="GLvoid *" output="true"/>
+ <param name="image" type="GLvoid *" output="true" img_format="format"
img_type="type"/>
</function>
<function name="GetnSeparableFilterARB" offset="assign">
@@ -128,7 +128,7 @@
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="values" type="GLvoid *" output="true"/>
+ <param name="values" type="GLvoid *" output="true" img_format="format"
img_type="type"/>
</function>
<function name="GetnMinmaxARB" offset="assign">
@@ -137,7 +137,7 @@
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
- <param name="values" type="GLvoid *" output="true"/>
+ <param name="values" type="GLvoid *" output="true" img_width="2"
img_format="format" img_type="type"/>
</function>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 669be60..a6f8dd0 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2788,7 +2788,7 @@
<param name="level" type="GLint"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="pixels" type="GLvoid *" output="true" img_width="width"
img_height="height" img_depth="depth" img_format="format" img_type="type"/>
+ <param name="pixels" type="GLvoid *" output="true" img_format="format"
img_type="type"/>
<glx sop="135" dimensions_in_reply="true"/>
</function>
@@ -3754,7 +3754,7 @@
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="table" type="GLvoid *" output="true" img_width="width"
img_format="format" img_type="type"/>
+ <param name="table" type="GLvoid *" output="true" img_format="format"
img_type="type"/>
<glx sop="147" dimensions_in_reply="true"/>
</function>
@@ -3863,7 +3863,7 @@
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="image" type="GLvoid *" output="true" img_width="width"
img_height="height" img_format="format" img_type="type"/>
+ <param name="image" type="GLvoid *" output="true" img_format="format"
img_type="type"/>
<glx sop="150" dimensions_in_reply="true"/>
</function>
@@ -3908,7 +3908,7 @@
<param name="reset" type="GLboolean"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="values" type="GLvoid *" output="true" img_width="width"
img_format="format" img_type="type"/>
+ <param name="values" type="GLvoid *" output="true" img_format="format"
img_type="type"/>
<glx sop="154" dimensions_in_reply="true" img_reset="reset"/>
</function>
@@ -8259,7 +8259,7 @@
<param name="reset" type="GLboolean"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="values" type="GLvoid *" output="true" img_width="width"
img_format="format" img_type="type"/>
+ <param name="values" type="GLvoid *" output="true" img_format="format"
img_type="type"/>
<glx vendorpriv="5" dimensions_in_reply="true" img_reset="reset"/>
</function>
@@ -8453,7 +8453,7 @@
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="image" type="GLvoid *" output="true" img_width="width"
img_height="height" img_format="format" img_type="type"/>
+ <param name="image" type="GLvoid *" output="true" img_format="format"
img_type="type"/>
<glx vendorpriv="1" dimensions_in_reply="true"/>
</function>
@@ -8586,7 +8586,7 @@
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="table" type="GLvoid *" output="true" img_width="width"
img_format="format" img_type="type"/>
+ <param name="table" type="GLvoid *" output="true" img_format="format"
img_type="type"/>
<glx vendorpriv="4098" dimensions_in_reply="true"/>
</function>
@@ -9244,7 +9244,7 @@
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
- <param name="table" type="GLvoid *" output="true" img_width="width"
img_format="format" img_type="type"/>
+ <param name="table" type="GLvoid *" output="true" img_format="format"
img_type="type"/>
<glx vendorpriv="4098" dimensions_in_reply="true"/>
</function>
--
1.7.0.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
