Make the transition to script-genereated GLX code easier.

Convert GL_ARB_texture_compression related functions to use the extension
version of the names instead of the GL 1.3 versions.

diff --git a/src/glx/x11/glx_texture_compression.c b/src/glx/x11/glx_texture_compression.c
index a478c194a9c1f172e6bc8b64c898d2ea8e2c9e9a..965c75e7882f3da7c5a499979bec7e6243877bad 100644 (file)
--- a/src/glx/x11/glx_texture_compression.c
+++ b/src/glx/x11/glx_texture_compression.c
@@ -39,7 +39,7 @@
 
 
 void
-__indirect_glGetCompressedTexImage( GLenum target, GLint level, 
+__indirect_glGetCompressedTexImageARB( GLenum target, GLint level, 
                                    GLvoid * img )
 {
     __GLX_SINGLE_DECLARE_VARIABLES();
@@ -192,7 +192,7 @@ CompressedTexSubImage1D2D( GLenum target, GLint level,
 
 
 void
-__indirect_glCompressedTexImage1D( GLenum target, GLint level,
+__indirect_glCompressedTexImage1DARB( GLenum target, GLint level,
                                   GLenum internal_format, GLsizei width,
                                   GLint border, GLsizei image_size,
                                   const GLvoid *data )
@@ -204,7 +204,7 @@ __indirect_glCompressedTexImage1D( GLenum target, GLint level,
 
 
 void
-__indirect_glCompressedTexImage2D( GLenum target, GLint level,
+__indirect_glCompressedTexImage2DARB( GLenum target, GLint level,
                                   GLenum internal_format,
                                   GLsizei width, GLsizei height,
                                   GLint border, GLsizei image_size,
@@ -217,7 +217,7 @@ __indirect_glCompressedTexImage2D( GLenum target, GLint level,
 
 
 void
-__indirect_glCompressedTexImage3D( GLenum target, GLint level,
+__indirect_glCompressedTexImage3DARB( GLenum target, GLint level,
                                   GLenum internal_format,
                                   GLsizei width, GLsizei height, GLsizei depth,
                                   GLint border, GLsizei image_size,
@@ -267,7 +267,7 @@ __indirect_glCompressedTexImage3D( GLenum target, GLint level,
 
 
 void
-__indirect_glCompressedTexSubImage1D( GLenum target, GLint level,
+__indirect_glCompressedTexSubImage1DARB( GLenum target, GLint level,
                                      GLint xoffset,
                                      GLsizei width,
                                      GLenum format, GLsizei image_size,
@@ -280,7 +280,7 @@ __indirect_glCompressedTexSubImage1D( GLenum target, GLint level,
 
 
 void
-__indirect_glCompressedTexSubImage2D( GLenum target, GLint level,
+__indirect_glCompressedTexSubImage2DARB( GLenum target, GLint level,
                                      GLint xoffset, GLint yoffset,
                                      GLsizei width, GLsizei height,
                                      GLenum format, GLsizei image_size,
@@ -293,7 +293,7 @@ __indirect_glCompressedTexSubImage2D( GLenum target, GLint level,
 
 
 void
-__indirect_glCompressedTexSubImage3D( GLenum target, GLint level,
+__indirect_glCompressedTexSubImage3DARB( GLenum target, GLint level,
                                      GLint xoffset, GLint yoffset, GLint zoffset,
                                      GLsizei width, GLsizei height, GLsizei depth,
                                      GLenum format, GLsizei image_size,

diff --git a/src/glx/x11/indirect.h b/src/glx/x11/indirect.h
index 4982f4618902dd2fb306525e48c90cc0d4c0ef63..9434ab99793489734ba4f0e289b4516607840a16 100644 (file)
--- a/src/glx/x11/indirect.h
+++ b/src/glx/x11/indirect.h
@@ -572,26 +572,26 @@ void __indirect_glSamplePatternSGIS( GLenum pass );
 
 /* ARB 12. GL_ARB_texture_compression / GL 1.3 */
 
-void __indirect_glGetCompressedTexImage( GLenum target, GLint level,
+void __indirect_glGetCompressedTexImageARB( GLenum target, GLint level,
     GLvoid * img );
-void __indirect_glCompressedTexImage1D( GLenum target, GLint level,
+void __indirect_glCompressedTexImage1DARB( GLenum target, GLint level,
     GLenum internalformat, GLsizei width,
     GLint border, GLsizei image_size, const GLvoid *data );
-void __indirect_glCompressedTexImage2D( GLenum target, GLint level,
+void __indirect_glCompressedTexImage2DARB( GLenum target, GLint level,
     GLenum internalformat, GLsizei width, GLsizei height,
     GLint border, GLsizei image_size, const GLvoid *data );
-void __indirect_glCompressedTexImage3D( GLenum target, GLint level,
+void __indirect_glCompressedTexImage3DARB( GLenum target, GLint level,
     GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth,
     GLint border, GLsizei image_size, const GLvoid *data );
-void __indirect_glCompressedTexSubImage1D( GLenum target, GLint level,
+void __indirect_glCompressedTexSubImage1DARB( GLenum target, GLint level,
     GLint xoffset,
     GLsizei width,
     GLenum format, GLsizei image_size, const GLvoid *data );
-void __indirect_glCompressedTexSubImage2D( GLenum target, GLint level,
+void __indirect_glCompressedTexSubImage2DARB( GLenum target, GLint level,
     GLint xoffset, GLint yoffset,
     GLsizei width, GLsizei height,
     GLenum format, GLsizei image_size, const GLvoid *data );
-void __indirect_glCompressedTexSubImage3D( GLenum target, GLint level,
+void __indirect_glCompressedTexSubImage3DARB( GLenum target, GLint level,
     GLint xoffset, GLint yoffset, GLint zoffset,
     GLsizei width, GLsizei height, GLsizei depth,
     GLenum format, GLsizei image_size, const GLvoid *data );

diff --git a/src/glx/x11/indirect_init.c b/src/glx/x11/indirect_init.c
index b3d6c8343cf090708b2267a6ebd2a83b48703198..461603a22d7f0b2151e75c38b518f59d4c197caf 100644 (file)
--- a/src/glx/x11/indirect_init.c
+++ b/src/glx/x11/indirect_init.c
@@ -541,13 +541,13 @@ __GLapi *__glXNewIndirectAPI(void)
     glAPI->SampleCoverageARB = __indirect_glSampleCoverageARB;
 
     /* ARB 12. GL_ARB_texture_compression / 1.3 */
-    glAPI->GetCompressedTexImageARB = __indirect_glGetCompressedTexImage;
-    glAPI->CompressedTexImage1DARB = __indirect_glCompressedTexImage1D;
-    glAPI->CompressedTexImage2DARB = __indirect_glCompressedTexImage2D;
-    glAPI->CompressedTexImage3DARB = __indirect_glCompressedTexImage3D;
-    glAPI->CompressedTexSubImage1DARB = __indirect_glCompressedTexSubImage1D;
-    glAPI->CompressedTexSubImage2DARB = __indirect_glCompressedTexSubImage2D;
-    glAPI->CompressedTexSubImage3DARB = __indirect_glCompressedTexSubImage3D;
+    glAPI->GetCompressedTexImageARB = __indirect_glGetCompressedTexImageARB;
+    glAPI->CompressedTexImage1DARB = __indirect_glCompressedTexImage1DARB;
+    glAPI->CompressedTexImage2DARB = __indirect_glCompressedTexImage2DARB;
+    glAPI->CompressedTexImage3DARB = __indirect_glCompressedTexImage3DARB;
+    glAPI->CompressedTexSubImage1DARB = __indirect_glCompressedTexSubImage1DARB;
+    glAPI->CompressedTexSubImage2DARB = __indirect_glCompressedTexSubImage2DARB;
+    glAPI->CompressedTexSubImage3DARB = __indirect_glCompressedTexSubImage3DARB;
 
     /* ARB 14. GL_ARB_point_parameters */
     glAPI->PointParameterfEXT = __indirect_glPointParameterfARB;