Make the transition to script-genereated GLX code easier.

Convert GL 1.4 / ARB_point_parameter function names to EXT_point_parameter /
NV_point_sprite names.

diff --git a/src/glx/x11/compsize.c b/src/glx/x11/compsize.c
index a42e448e4603e96528346c903f5f4c879c467083..3a562b91d711153c8020165a51e4dcb27afde103 100644 (file)
--- a/src/glx/x11/compsize.c
+++ b/src/glx/x11/compsize.c
@@ -497,7 +497,7 @@ GLint __glConvolutionParameteriv_size(GLenum pname)
     return __glConvolutionParameterfv_size(pname);
 }
 
-GLint __glPointParameterfvARB_size(GLenum e)
+GLint __glPointParameterfvEXT_size(GLenum e)
 {
     switch (e) {
       case GL_POINT_SIZE_MIN:
@@ -516,7 +516,7 @@ GLint __glPointParameterfvARB_size(GLenum e)
     }
 }
 
-GLint __glPointParameteriv_size(GLenum e)
+GLint __glPointParameterivNV_size(GLenum e)
 {
-    return __glPointParameterfvARB_size(e);
+    return __glPointParameterfvEXT_size(e);
 }

diff --git a/src/glx/x11/indirect.h b/src/glx/x11/indirect.h
index 442c4ab53b3846c37ced62c0f99ffd3035384826..8b5db1b421e0f57edba9628f2c5ef9c185a44057 100644 (file)
--- a/src/glx/x11/indirect.h
+++ b/src/glx/x11/indirect.h
@@ -404,8 +404,13 @@ glxvendr_enum1_4(MultiTexCoord4i,  X_GLrop_MultiTexCoord4ivARB, GLint,    ARB)
 glxvendr_enum1_4(MultiTexCoord4f,  X_GLrop_MultiTexCoord4fvARB, GLfloat,  ARB)
 glxvendr_enum1_4(MultiTexCoord4d,  X_GLrop_MultiTexCoord4dvARB, GLdouble, ARB)
 
-glxvendr_enum1_V(PointParameterf, X_GLrop_PointParameterf, GLfloat, ARB)
-glxproto_enum1_V(PointParameteri, X_GLrop_PointParameteri, GLint)
+#define X_GLrop_PointParameterfEXT  2065
+#define X_GLrop_PointParameterfvEXT 2066
+#define X_GLrop_PointParameteriNV   4221
+#define X_GLrop_PointParameterivNV  4222
+
+glxvendr_enum1_V(PointParameterf, X_GLrop_PointParameterf, GLfloat, EXT)
+glxvendr_enum1_V(PointParameteri, X_GLrop_PointParameteri, GLint,   NV)
 
 glxvendr_3(WindowPos3f, X_GLrop_WindowPos3fARB, GLfloat, MESA)
 

diff --git a/src/glx/x11/indirect_init.c b/src/glx/x11/indirect_init.c
index 5fcfab61f1ba7c042e0e07a582f6866fd161c0c3..29c2eb5d39ddbae6fbb663678f60775c4d2136e1 100644 (file)
--- a/src/glx/x11/indirect_init.c
+++ b/src/glx/x11/indirect_init.c
@@ -503,8 +503,8 @@ __GLapi *__glXNewIndirectAPI(void)
     glAPI->CompressedTexSubImage3DARB = __indirect_glCompressedTexSubImage3DARB;
 
     /* ARB 14. GL_ARB_point_parameters */
-    glAPI->PointParameterfEXT = __indirect_glPointParameterfARB;
-    glAPI->PointParameterfvEXT = __indirect_glPointParameterfvARB;
+    glAPI->PointParameterfEXT = __indirect_glPointParameterfEXT;
+    glAPI->PointParameterfvEXT = __indirect_glPointParameterfvEXT;
 
     /* ARB 15. GL_ARB_window_pos */
     glAPI->WindowPos2dMESA = __indirect_glWindowPos2dMESA;
@@ -567,8 +567,8 @@ __GLapi *__glXNewIndirectAPI(void)
     glAPI->BlendFuncSeparateEXT = __indirect_glBlendFuncSeparate;
 
     /* 262. GL_NV_point_sprite / GL 1.4 */
-    glAPI->PointParameteriNV = __indirect_glPointParameteri;
-    glAPI->PointParameterivNV = __indirect_glPointParameteriv;
+    glAPI->PointParameteriNV = __indirect_glPointParameteriNV;
+    glAPI->PointParameterivNV = __indirect_glPointParameterivNV;
 
     /* 268. GL_EXT_stencil_two_side */
     glAPI->ActiveStencilFaceEXT = __indirect_glActiveStencilFaceEXT;

diff --git a/src/glx/x11/size.h b/src/glx/x11/size.h
index e04696af19aba603261986e13a993dab813000fa..795eeffb8fd0c71c74fafadf1ebb0c39dbc56795 100644 (file)
--- a/src/glx/x11/size.h
+++ b/src/glx/x11/size.h
@@ -66,7 +66,7 @@ extern GLint __glTexImage2D_size(GLenum format, GLenum type, GLsizei w, GLsizei
 extern GLint __glTexImage3D_size(GLenum format, GLenum type, GLsizei w, GLsizei h, GLsizei d);
 extern GLint __glTexParameterfv_size(GLenum e);
 extern GLint __glTexParameteriv_size(GLenum e);
-extern GLint __glPointParameterfvARB_size(GLenum e);
-extern GLint __glPointParameteriv_size(GLenum e);
+extern GLint __glPointParameterfvEXT_size(GLenum e);
+extern GLint __glPointParameterivNV_size(GLenum e);
 
 #endif /* _size_h_ */