Import fixes from X.org tree (Søren Sandmann <sandmann@redhat.com>).

[mesa.git] / src / glx / x11 / glx_texture_compression.c

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,