frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: Consistently use ARB-suffixed names for ARB_multitexture functions 

At the moment we have a mix of ARB and non-ARB suffixed forms for ARB_multitexture functions
e.g. glMultiTexCoord1fvARB and glMultiTexCoord1dv

Consistently use the ARB-suffixed form, assuming that is present in all libGL
which provide the OpenGL 1.2.1 ABI we expect to be able to directly link with.

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Jon TURNEY 2013-12-06 14:00:21 +00:00
parent 1a021f57a1
commit cb48877a3c
2 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
glx/indirect_dispatch.c
View File

@ -3460,7 +3460,7 @@ __glXDisp_CopyTexSubImage3D(GLbyte * pc)
void void
__glXDisp_ActiveTexture(GLbyte * pc) __glXDisp_ActiveTexture(GLbyte * pc)
{ {
glActiveTexture(*(GLenum *) (pc + 0)); glActiveTextureARB(*(GLenum *) (pc + 0));
} }
void void
@ -3473,7 +3473,7 @@ __glXDisp_MultiTexCoord1dv(GLbyte * pc)
} }
#endif #endif
glMultiTexCoord1dv(*(GLenum *) (pc + 8), (const GLdouble *) (pc + 0)); glMultiTexCoord1dvARB(*(GLenum *) (pc + 8), (const GLdouble *) (pc + 0));
} }
void void
@ -3485,13 +3485,13 @@ __glXDisp_MultiTexCoord1fvARB(GLbyte * pc)
void void
__glXDisp_MultiTexCoord1iv(GLbyte * pc) __glXDisp_MultiTexCoord1iv(GLbyte * pc)
{ {
glMultiTexCoord1iv(*(GLenum *) (pc + 0), (const GLint *) (pc + 4)); glMultiTexCoord1ivARB(*(GLenum *) (pc + 0), (const GLint *) (pc + 4));
} }
void void
__glXDisp_MultiTexCoord1sv(GLbyte * pc) __glXDisp_MultiTexCoord1sv(GLbyte * pc)
{ {
glMultiTexCoord1sv(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4)); glMultiTexCoord1svARB(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4));
} }
void void
@ -3504,7 +3504,7 @@ __glXDisp_MultiTexCoord2dv(GLbyte * pc)
} }
#endif #endif
glMultiTexCoord2dv(*(GLenum *) (pc + 16), (const GLdouble *) (pc + 0)); glMultiTexCoord2dvARB(*(GLenum *) (pc + 16), (const GLdouble *) (pc + 0));
} }
void void
@ -3516,13 +3516,13 @@ __glXDisp_MultiTexCoord2fvARB(GLbyte * pc)
void void
__glXDisp_MultiTexCoord2iv(GLbyte * pc) __glXDisp_MultiTexCoord2iv(GLbyte * pc)
{ {
glMultiTexCoord2iv(*(GLenum *) (pc + 0), (const GLint *) (pc + 4)); glMultiTexCoord2ivARB(*(GLenum *) (pc + 0), (const GLint *) (pc + 4));
} }
void void
__glXDisp_MultiTexCoord2sv(GLbyte * pc) __glXDisp_MultiTexCoord2sv(GLbyte * pc)
{ {
glMultiTexCoord2sv(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4)); glMultiTexCoord2svARB(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4));
} }
void void
@ -3535,7 +3535,7 @@ __glXDisp_MultiTexCoord3dv(GLbyte * pc)
} }
#endif #endif
glMultiTexCoord3dv(*(GLenum *) (pc + 24), (const GLdouble *) (pc + 0)); glMultiTexCoord3dvARB(*(GLenum *) (pc + 24), (const GLdouble *) (pc + 0));
} }
void void
@ -3547,13 +3547,13 @@ __glXDisp_MultiTexCoord3fvARB(GLbyte * pc)
void void
__glXDisp_MultiTexCoord3iv(GLbyte * pc) __glXDisp_MultiTexCoord3iv(GLbyte * pc)
{ {
glMultiTexCoord3iv(*(GLenum *) (pc + 0), (const GLint *) (pc + 4)); glMultiTexCoord3ivARB(*(GLenum *) (pc + 0), (const GLint *) (pc + 4));
} }
void void
__glXDisp_MultiTexCoord3sv(GLbyte * pc) __glXDisp_MultiTexCoord3sv(GLbyte * pc)
{ {
glMultiTexCoord3sv(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4)); glMultiTexCoord3svARB(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4));
} }
void void
@ -3566,7 +3566,7 @@ __glXDisp_MultiTexCoord4dv(GLbyte * pc)
} }
#endif #endif
glMultiTexCoord4dv(*(GLenum *) (pc + 32), (const GLdouble *) (pc + 0)); glMultiTexCoord4dvARB(*(GLenum *) (pc + 32), (const GLdouble *) (pc + 0));
} }
void void
@ -3578,13 +3578,13 @@ __glXDisp_MultiTexCoord4fvARB(GLbyte * pc)
void void
__glXDisp_MultiTexCoord4iv(GLbyte * pc) __glXDisp_MultiTexCoord4iv(GLbyte * pc)
{ {
glMultiTexCoord4iv(*(GLenum *) (pc + 0), (const GLint *) (pc + 4)); glMultiTexCoord4ivARB(*(GLenum *) (pc + 0), (const GLint *) (pc + 4));
} }
void void
__glXDisp_MultiTexCoord4sv(GLbyte * pc) __glXDisp_MultiTexCoord4sv(GLbyte * pc)
{ {
glMultiTexCoord4sv(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4)); glMultiTexCoord4svARB(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4));
} }
void void

26
glx/indirect_dispatch_swap.c
View File

@ -3821,7 +3821,7 @@ __glXDispSwap_CopyTexSubImage3D(GLbyte * pc)
void void
__glXDispSwap_ActiveTexture(GLbyte * pc) __glXDispSwap_ActiveTexture(GLbyte * pc)
{ {
glActiveTexture((GLenum) bswap_ENUM(pc + 0)); glActiveTextureARB((GLenum) bswap_ENUM(pc + 0));
} }
void void
@ -3834,7 +3834,7 @@ __glXDispSwap_MultiTexCoord1dv(GLbyte * pc)
} }
#endif #endif
glMultiTexCoord1dv((GLenum) bswap_ENUM(pc + 8), glMultiTexCoord1dvARB((GLenum) bswap_ENUM(pc + 8),
(const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), (const GLdouble *) bswap_64_array((uint64_t *) (pc + 0),
1)); 1));
} }
@ -3850,7 +3850,7 @@ __glXDispSwap_MultiTexCoord1fvARB(GLbyte * pc)
void void
__glXDispSwap_MultiTexCoord1iv(GLbyte * pc) __glXDispSwap_MultiTexCoord1iv(GLbyte * pc)
{ {
glMultiTexCoord1iv((GLenum) bswap_ENUM(pc + 0), glMultiTexCoord1ivARB((GLenum) bswap_ENUM(pc + 0),
(const GLint *) bswap_32_array((uint32_t *) (pc + 4), (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
1)); 1));
} }
@ -3858,7 +3858,7 @@ __glXDispSwap_MultiTexCoord1iv(GLbyte * pc)
void void
__glXDispSwap_MultiTexCoord1sv(GLbyte * pc) __glXDispSwap_MultiTexCoord1sv(GLbyte * pc)
{ {
glMultiTexCoord1sv((GLenum) bswap_ENUM(pc + 0), glMultiTexCoord1svARB((GLenum) bswap_ENUM(pc + 0),
(const GLshort *) bswap_16_array((uint16_t *) (pc + 4), (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
1)); 1));
} }
@ -3873,7 +3873,7 @@ __glXDispSwap_MultiTexCoord2dv(GLbyte * pc)
} }
#endif #endif
glMultiTexCoord2dv((GLenum) bswap_ENUM(pc + 16), glMultiTexCoord2dvARB((GLenum) bswap_ENUM(pc + 16),
(const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), (const GLdouble *) bswap_64_array((uint64_t *) (pc + 0),
2)); 2));
} }
@ -3889,7 +3889,7 @@ __glXDispSwap_MultiTexCoord2fvARB(GLbyte * pc)
void void
__glXDispSwap_MultiTexCoord2iv(GLbyte * pc) __glXDispSwap_MultiTexCoord2iv(GLbyte * pc)
{ {
glMultiTexCoord2iv((GLenum) bswap_ENUM(pc + 0), glMultiTexCoord2ivARB((GLenum) bswap_ENUM(pc + 0),
(const GLint *) bswap_32_array((uint32_t *) (pc + 4), (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
2)); 2));
} }
@ -3897,7 +3897,7 @@ __glXDispSwap_MultiTexCoord2iv(GLbyte * pc)
void void
__glXDispSwap_MultiTexCoord2sv(GLbyte * pc) __glXDispSwap_MultiTexCoord2sv(GLbyte * pc)
{ {
glMultiTexCoord2sv((GLenum) bswap_ENUM(pc + 0), glMultiTexCoord2svARB((GLenum) bswap_ENUM(pc + 0),
(const GLshort *) bswap_16_array((uint16_t *) (pc + 4), (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
2)); 2));
} }
@ -3912,7 +3912,7 @@ __glXDispSwap_MultiTexCoord3dv(GLbyte * pc)
} }
#endif #endif
glMultiTexCoord3dv((GLenum) bswap_ENUM(pc + 24), glMultiTexCoord3dvARB((GLenum) bswap_ENUM(pc + 24),
(const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), (const GLdouble *) bswap_64_array((uint64_t *) (pc + 0),
3)); 3));
} }
@ -3928,7 +3928,7 @@ __glXDispSwap_MultiTexCoord3fvARB(GLbyte * pc)
void void
__glXDispSwap_MultiTexCoord3iv(GLbyte * pc) __glXDispSwap_MultiTexCoord3iv(GLbyte * pc)
{ {
glMultiTexCoord3iv((GLenum) bswap_ENUM(pc + 0), glMultiTexCoord3ivARB((GLenum) bswap_ENUM(pc + 0),
(const GLint *) bswap_32_array((uint32_t *) (pc + 4), (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
3)); 3));
} }
@ -3936,7 +3936,7 @@ __glXDispSwap_MultiTexCoord3iv(GLbyte * pc)
void void
__glXDispSwap_MultiTexCoord3sv(GLbyte * pc) __glXDispSwap_MultiTexCoord3sv(GLbyte * pc)
{ {
glMultiTexCoord3sv((GLenum) bswap_ENUM(pc + 0), glMultiTexCoord3svARB((GLenum) bswap_ENUM(pc + 0),
(const GLshort *) bswap_16_array((uint16_t *) (pc + 4), (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
3)); 3));
} }
@ -3951,7 +3951,7 @@ __glXDispSwap_MultiTexCoord4dv(GLbyte * pc)
} }
#endif #endif
glMultiTexCoord4dv((GLenum) bswap_ENUM(pc + 32), glMultiTexCoord4dvARB((GLenum) bswap_ENUM(pc + 32),
(const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), (const GLdouble *) bswap_64_array((uint64_t *) (pc + 0),
4)); 4));
} }
@ -3967,7 +3967,7 @@ __glXDispSwap_MultiTexCoord4fvARB(GLbyte * pc)
void void
__glXDispSwap_MultiTexCoord4iv(GLbyte * pc) __glXDispSwap_MultiTexCoord4iv(GLbyte * pc)
{ {
glMultiTexCoord4iv((GLenum) bswap_ENUM(pc + 0), glMultiTexCoord4ivARB((GLenum) bswap_ENUM(pc + 0),
(const GLint *) bswap_32_array((uint32_t *) (pc + 4), (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
4)); 4));
} }
@ -3975,7 +3975,7 @@ __glXDispSwap_MultiTexCoord4iv(GLbyte * pc)
void void
__glXDispSwap_MultiTexCoord4sv(GLbyte * pc) __glXDispSwap_MultiTexCoord4sv(GLbyte * pc)
{ {
glMultiTexCoord4sv((GLenum) bswap_ENUM(pc + 0), glMultiTexCoord4svARB((GLenum) bswap_ENUM(pc + 0),
(const GLshort *) bswap_16_array((uint16_t *) (pc + 4), (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
4)); 4));
} }