From: Ian Romanick Date: Wed, 1 Dec 2004 07:34:25 +0000 (+0000) Subject: Make the transition to script-genereated GLX code easier. X-Git-Tag: 062012170305~23718 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=249a5552f122c1ae7b58d1a5f693607d04c22e05;p=profile%2Fivi%2Fmesa.git 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 a478c19..965c75e 100644 --- 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 4982f46..9434ab9 100644 --- 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 b3d6c83..461603a 100644 --- 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;