diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c
index 2a1a54408e1..ae2b14c6c3a 100644
--- a/src/glx/x11/indirect_size.c
+++ b/src/glx/x11/indirect_size.c
@@ -1,4 +1,4 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_send.py (from Mesa) script */
+/* DO NOT EDIT - This file generated automatically by glX_proto_size.py (from Mesa) script */
/*
* (C) Copyright IBM Corporation 2004
@@ -166,14 +166,25 @@ __glTexParameterfv_size( GLenum e )
case GL_TEXTURE_WRAP_S:
case GL_TEXTURE_WRAP_T:
case GL_TEXTURE_PRIORITY:
- case GL_TEXTURE_RESIDENT:
case GL_TEXTURE_WRAP_R:
+ case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
+/* case GL_SHADOW_AMBIENT_SGIX:*/
case GL_TEXTURE_MIN_LOD:
case GL_TEXTURE_MAX_LOD:
case GL_TEXTURE_BASE_LEVEL:
case GL_TEXTURE_MAX_LEVEL:
+ case GL_TEXTURE_CLIPMAP_FRAME_SGIX:
+ case GL_TEXTURE_LOD_BIAS_S_SGIX:
+ case GL_TEXTURE_LOD_BIAS_T_SGIX:
+ case GL_TEXTURE_LOD_BIAS_R_SGIX:
case GL_GENERATE_MIPMAP:
/* case GL_GENERATE_MIPMAP_SGIS:*/
+ case GL_TEXTURE_COMPARE_SGIX:
+ case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
+ case GL_TEXTURE_MAX_CLAMP_S_SGIX:
+ case GL_TEXTURE_MAX_CLAMP_T_SGIX:
+ case GL_TEXTURE_MAX_CLAMP_R_SGIX:
+ case GL_TEXTURE_MAX_ANISOTROPY_EXT:
case GL_TEXTURE_LOD_BIAS:
/* case GL_TEXTURE_LOD_BIAS_EXT:*/
case GL_DEPTH_TEXTURE_MODE:
@@ -182,17 +193,6 @@ __glTexParameterfv_size( GLenum e )
/* case GL_TEXTURE_COMPARE_MODE_ARB:*/
case GL_TEXTURE_COMPARE_FUNC:
/* case GL_TEXTURE_COMPARE_FUNC_ARB:*/
- case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
-/* case GL_SHADOW_AMBIENT_SGIX:*/
- case GL_TEXTURE_COMPARE_SGIX:
- case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
- case GL_TEXTURE_LOD_BIAS_S_SGIX:
- case GL_TEXTURE_LOD_BIAS_T_SGIX:
- case GL_TEXTURE_LOD_BIAS_R_SGIX:
- case GL_TEXTURE_MAX_ANISOTROPY_EXT:
- case GL_TEXTURE_MAX_CLAMP_S_SGIX:
- case GL_TEXTURE_MAX_CLAMP_T_SGIX:
- case GL_TEXTURE_MAX_CLAMP_R_SGIX:
case GL_TEXTURE_UNSIGNED_REMAP_MODE_NV:
return 1;
case GL_TEXTURE_CLIPMAP_CENTER_SGIX:
@@ -214,27 +214,28 @@ __glTexEnvfv_size( GLenum e )
switch( e ) {
case GL_ALPHA_SCALE:
case GL_TEXTURE_ENV_MODE:
+ case GL_TEXTURE_LOD_BIAS:
case GL_COMBINE_RGB:
case GL_COMBINE_ALPHA:
+ case GL_RGB_SCALE:
case GL_SOURCE0_RGB:
case GL_SOURCE1_RGB:
case GL_SOURCE2_RGB:
+ case GL_SOURCE3_RGB_NV:
case GL_SOURCE0_ALPHA:
case GL_SOURCE1_ALPHA:
case GL_SOURCE2_ALPHA:
+ case GL_SOURCE3_ALPHA_NV:
case GL_OPERAND0_RGB:
case GL_OPERAND1_RGB:
case GL_OPERAND2_RGB:
+ case GL_OPERAND3_RGB_NV:
case GL_OPERAND0_ALPHA:
case GL_OPERAND1_ALPHA:
case GL_OPERAND2_ALPHA:
- case GL_RGB_SCALE:
- case GL_TEXTURE_LOD_BIAS:
- case GL_COORD_REPLACE_ARB:
- case GL_SOURCE3_RGB_NV:
- case GL_SOURCE3_ALPHA_NV:
- case GL_OPERAND3_RGB_NV:
case GL_OPERAND3_ALPHA_NV:
+ case GL_COORD_REPLACE_ARB:
+/* case GL_COORD_REPLACE_NV:*/
return 1;
case GL_TEXTURE_ENV_COLOR:
return 4;
@@ -321,11 +322,15 @@ INTERNAL PURE FASTCALL GLint
__glConvolutionParameterfv_size( GLenum e )
{
switch( e ) {
- case GL_CONVOLUTION_BORDER_MODE_EXT:
+ case GL_CONVOLUTION_BORDER_MODE:
+/* case GL_CONVOLUTION_BORDER_MODE_EXT:*/
return 1;
- case GL_CONVOLUTION_BORDER_COLOR_HP:
- case GL_CONVOLUTION_FILTER_SCALE_EXT:
- case GL_CONVOLUTION_FILTER_BIAS_EXT:
+ case GL_CONVOLUTION_FILTER_SCALE:
+/* case GL_CONVOLUTION_FILTER_SCALE_EXT:*/
+ case GL_CONVOLUTION_FILTER_BIAS:
+/* case GL_CONVOLUTION_FILTER_BIAS_EXT:*/
+ case GL_CONVOLUTION_BORDER_COLOR:
+/* case GL_CONVOLUTION_BORDER_COLOR_HP:*/
return 4;
default: return 0;
}
@@ -348,6 +353,7 @@ __glPointParameterfvEXT_size( GLenum e )
/* case GL_POINT_FADE_THRESHOLD_SIZE_EXT:*/
/* case GL_POINT_FADE_THRESHOLD_SIZE_SGIS:*/
case GL_POINT_SPRITE_R_MODE_NV:
+ case GL_POINT_SPRITE_COORD_ORIGIN:
return 1;
case GL_POINT_DISTANCE_ATTENUATION:
/* case GL_POINT_DISTANCE_ATTENUATION_ARB:*/
diff --git a/src/glx/x11/indirect_size.h b/src/glx/x11/indirect_size.h
index 6083ac51658..833e95b2413 100644
--- a/src/glx/x11/indirect_size.h
+++ b/src/glx/x11/indirect_size.h
@@ -1,4 +1,4 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_send.py (from Mesa) script */
+/* DO NOT EDIT - This file generated automatically by glX_proto_size.py (from Mesa) script */
/*
* (C) Copyright IBM Corporation 2004
diff --git a/src/mesa/glapi/glX_XML.py b/src/mesa/glapi/glX_XML.py
index dcfb0156230..df3e6bb1cb8 100644
--- a/src/mesa/glapi/glX_XML.py
+++ b/src/mesa/glapi/glX_XML.py
@@ -120,6 +120,7 @@ class glXEnumFunction:
if self.sig == None:
self.sig = ""
for i in self.count:
+ self.count[i].sort()
for e in self.count[i]:
self.sig += "%04x,%u," % (e, i)
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index 1be72a1e1e5..fe1aa42332e 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -55,7 +55,7 @@
The various attributes for param and glx have the meanings listed below.
When adding new functions, please annote them correct. In most cases this
will just mean adding a '' tag.
-
+
param:
name - name of the parameter
type - fully qualified type (e.g., with "const", etc.)
@@ -375,6 +375,8 @@ glx:
+
+
@@ -488,13 +490,27 @@ glx:
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -504,46 +520,72 @@ glx:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -596,18 +638,26 @@ glx:
+
+
+
+
+
+
+
+
@@ -652,10 +702,14 @@ glx:
+
+
+
+
@@ -665,16 +719,25 @@ glx:
+
+
+
+
+
+
-
+
+
+
+
@@ -685,18 +748,26 @@ glx:
+
+
+
+
+
+
+
+
@@ -2659,21 +2730,41 @@ glx:
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -2948,10 +3039,15 @@ glx:
-
+
+
+
+
+
+
@@ -2969,18 +3065,26 @@ glx:
+
+
+
+
+
+
+
+
@@ -2996,7 +3100,105 @@ glx:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3430,8 +3632,14 @@ glx:
-
-
+
+
+
+
+
+
+
+
@@ -3440,62 +3648,92 @@ glx:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3815,6 +4053,8 @@ glx:
+
+
@@ -3843,21 +4083,34 @@ glx:
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
@@ -4256,6 +4509,11 @@ glx:
+
+
+
+
+
@@ -4608,8 +4866,14 @@ glx:
-
-
+
+
+
+
+
+
+
+
@@ -4908,10 +5172,15 @@ glx:
-
+
+
+
+
+
+
@@ -4919,10 +5188,14 @@ glx:
+
+
+
+
@@ -4931,6 +5204,8 @@ glx:
+
+
@@ -6067,6 +6342,8 @@ glx:
+
+
@@ -6166,12 +6443,30 @@ glx:
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6308,6 +6603,51 @@ glx:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6377,23 +6717,60 @@ glx:
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6460,21 +6837,21 @@ glx:
-
+
-
+
-
+
@@ -6484,7 +6861,7 @@ glx:
-
+
@@ -6784,6 +7161,8 @@ glx:
+
+
@@ -6793,15 +7172,26 @@ glx:
+
+
+
+
+
+
+
+
-
+
+
+
+
@@ -6816,10 +7206,14 @@ glx:
+
+
+
+
@@ -6932,10 +7326,14 @@ glx:
+
+
+
+
@@ -7072,6 +7470,43 @@ glx:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7152,17 +7587,23 @@ glx:
-
+
+
+
-
+
+
+
-
+
+
+
@@ -8226,6 +8667,8 @@ glx:
+
+
@@ -8233,6 +8676,8 @@ glx:
+
+
@@ -8389,18 +8834,26 @@ glx:
+
+
+
+
+
+
+
+
@@ -9342,14 +9795,20 @@ glx:
+
+
+
+
+
+
@@ -9521,7 +9980,14 @@ glx:
-
+
+
+
+
+
+
+
+
@@ -9619,6 +10085,8 @@ glx:
+
+