diff options
Diffstat (limited to 'src')
87 files changed, 3176 insertions, 3259 deletions
diff --git a/src/glx/apple/apple_glapi.c b/src/glx/apple/apple_glapi.c index 9a670bcfbb0..c9327814d98 100644 --- a/src/glx/apple/apple_glapi.c +++ b/src/glx/apple/apple_glapi.c @@ -64,7 +64,7 @@ static void _apple_glapi_create_table(void) { SET_CopyPixels(__applegl_api, __applegl_glCopyPixels); SET_CopyColorTable(__applegl_api, __applegl_glCopyColorTable); SET_DrawBuffer(__applegl_api, __applegl_glDrawBuffer); - SET_DrawBuffersARB(__applegl_api, __applegl_glDrawBuffersARB); + SET_DrawBuffers(__applegl_api, __applegl_glDrawBuffers); SET_Viewport(__applegl_api, __applegl_glViewport); } diff --git a/src/glx/apple/apple_xgl_api.h b/src/glx/apple/apple_xgl_api.h index 2365d64788f..56e76b0f445 100644 --- a/src/glx/apple/apple_xgl_api.h +++ b/src/glx/apple/apple_xgl_api.h @@ -36,7 +36,7 @@ void __applegl_glCopyColorTable(GLenum target, GLenum internalformat, GLint x, G GLsizei width); void __applegl_glDrawBuffer(GLenum mode); -void __applegl_glDrawBuffersARB(GLsizei n, const GLenum * bufs); +void __applegl_glDrawBuffers(GLsizei n, const GLenum * bufs); void __applegl_glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/glx/apple/apple_xgl_api_stereo.c b/src/glx/apple/apple_xgl_api_stereo.c index 2664a3f226b..c9ed684b279 100644 --- a/src/glx/apple/apple_xgl_api_stereo.c +++ b/src/glx/apple/apple_xgl_api_stereo.c @@ -84,7 +84,7 @@ __applegl_glDrawBuffer(GLenum mode) void -__applegl_glDrawBuffersARB(GLsizei n, const GLenum * bufs) +__applegl_glDrawBuffers(GLsizei n, const GLenum * bufs) { struct glx_context * gc = __glXGetCurrentContext(); diff --git a/src/glx/indirect_texture_compression.c b/src/glx/indirect_texture_compression.c index fa927ebdf68..314334bd228 100644 --- a/src/glx/indirect_texture_compression.c +++ b/src/glx/indirect_texture_compression.c @@ -40,7 +40,7 @@ void -__indirect_glGetCompressedTexImageARB(GLenum target, GLint level, +__indirect_glGetCompressedTexImage(GLenum target, GLint level, GLvoid * img) { __GLX_SINGLE_DECLARE_VARIABLES(); @@ -191,7 +191,7 @@ CompressedTexSubImage1D2D(GLenum target, GLint level, void -__indirect_glCompressedTexImage1DARB(GLenum target, GLint level, +__indirect_glCompressedTexImage1D(GLenum target, GLint level, GLenum internal_format, GLsizei width, GLint border, GLsizei image_size, const GLvoid * data) @@ -203,7 +203,7 @@ __indirect_glCompressedTexImage1DARB(GLenum target, GLint level, void -__indirect_glCompressedTexImage2DARB(GLenum target, GLint level, +__indirect_glCompressedTexImage2D(GLenum target, GLint level, GLenum internal_format, GLsizei width, GLsizei height, GLint border, GLsizei image_size, @@ -216,7 +216,7 @@ __indirect_glCompressedTexImage2DARB(GLenum target, GLint level, void -__indirect_glCompressedTexImage3DARB(GLenum target, GLint level, +__indirect_glCompressedTexImage3D(GLenum target, GLint level, GLenum internal_format, GLsizei width, GLsizei height, GLsizei depth, GLint border, @@ -264,7 +264,7 @@ __indirect_glCompressedTexImage3DARB(GLenum target, GLint level, void -__indirect_glCompressedTexSubImage1DARB(GLenum target, GLint level, +__indirect_glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei image_size, @@ -277,7 +277,7 @@ __indirect_glCompressedTexSubImage1DARB(GLenum target, GLint level, void -__indirect_glCompressedTexSubImage2DARB(GLenum target, GLint level, +__indirect_glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei image_size, @@ -290,7 +290,7 @@ __indirect_glCompressedTexSubImage2DARB(GLenum target, GLint level, void -__indirect_glCompressedTexSubImage3DARB(GLenum target, GLint level, +__indirect_glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, diff --git a/src/glx/indirect_transpose_matrix.c b/src/glx/indirect_transpose_matrix.c index 618db9f5d4f..8cb53f3591e 100644 --- a/src/glx/indirect_transpose_matrix.c +++ b/src/glx/indirect_transpose_matrix.c @@ -49,7 +49,7 @@ TransposeMatrixd(const GLdouble s[16], GLdouble d[16]) void -__indirect_glLoadTransposeMatrixdARB(const GLdouble * m) +__indirect_glLoadTransposeMatrixd(const GLdouble * m) { GLdouble mt[16]; @@ -58,7 +58,7 @@ __indirect_glLoadTransposeMatrixdARB(const GLdouble * m) } void -__indirect_glLoadTransposeMatrixfARB(const GLfloat * m) +__indirect_glLoadTransposeMatrixf(const GLfloat * m) { GLfloat mt[16]; @@ -67,7 +67,7 @@ __indirect_glLoadTransposeMatrixfARB(const GLfloat * m) } void -__indirect_glMultTransposeMatrixdARB(const GLdouble * m) +__indirect_glMultTransposeMatrixd(const GLdouble * m) { GLdouble mt[16]; @@ -76,7 +76,7 @@ __indirect_glMultTransposeMatrixdARB(const GLdouble * m) } void -__indirect_glMultTransposeMatrixfARB(const GLfloat * m) +__indirect_glMultTransposeMatrixf(const GLfloat * m) { GLfloat mt[16]; diff --git a/src/glx/indirect_vertex_array.c b/src/glx/indirect_vertex_array.c index 3f7ab679429..c723c9eeb73 100644 --- a/src/glx/indirect_vertex_array.c +++ b/src/glx/indirect_vertex_array.c @@ -1030,7 +1030,7 @@ __indirect_glDrawRangeElements(GLenum mode, GLuint start, GLuint end, void -__indirect_glMultiDrawArraysEXT(GLenum mode, const GLint *first, +__indirect_glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount) { struct glx_context *gc = __glXGetCurrentContext(); @@ -1462,7 +1462,7 @@ __indirect_glTexCoordPointer(GLint size, GLenum type, GLsizei stride, void -__indirect_glSecondaryColorPointerEXT(GLint size, GLenum type, GLsizei stride, +__indirect_glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) { uint16_t opcode; @@ -1522,7 +1522,7 @@ __indirect_glSecondaryColorPointerEXT(GLint size, GLenum type, GLsizei stride, void -__indirect_glFogCoordPointerEXT(GLenum type, GLsizei stride, +__indirect_glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid * pointer) { uint16_t opcode; @@ -1564,7 +1564,7 @@ __indirect_glFogCoordPointerEXT(GLenum type, GLsizei stride, void -__indirect_glVertexAttribPointerARB(GLuint index, GLint size, +__indirect_glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer) { @@ -1701,7 +1701,7 @@ __indirect_glVertexAttribPointerNV(GLuint index, GLint size, case GL_SHORT: case GL_FLOAT: case GL_DOUBLE: - __indirect_glVertexAttribPointerARB(index, size, type, + __indirect_glVertexAttribPointer(index, size, type, normalized, stride, pointer); return; default: @@ -1712,7 +1712,7 @@ __indirect_glVertexAttribPointerNV(GLuint index, GLint size, void -__indirect_glClientActiveTextureARB(GLenum texture) +__indirect_glClientActiveTexture(GLenum texture) { struct glx_context *const gc = __glXGetCurrentContext(); __GLXattribute *const state = @@ -1961,13 +1961,13 @@ __glXPopArrayState(__GLXattribute * state) stack[i].user_stride, stack[i].data); break; case GL_SECONDARY_COLOR_ARRAY: - __indirect_glSecondaryColorPointerEXT(stack[i].count, + __indirect_glSecondaryColorPointer(stack[i].count, stack[i].data_type, stack[i].user_stride, stack[i].data); break; case GL_FOG_COORDINATE_ARRAY: - __indirect_glFogCoordPointerEXT(stack[i].data_type, + __indirect_glFogCoordPointer(stack[i].data_type, stack[i].user_stride, stack[i].data); break; diff --git a/src/glx/indirect_vertex_program.c b/src/glx/indirect_vertex_program.c index d955fdfa93e..54a936d29b5 100644 --- a/src/glx/indirect_vertex_program.c +++ b/src/glx/indirect_vertex_program.c @@ -48,14 +48,14 @@ do_vertex_attrib_enable(GLuint index, GLboolean val) void -__indirect_glEnableVertexAttribArrayARB(GLuint index) +__indirect_glEnableVertexAttribArray(GLuint index) { do_vertex_attrib_enable(index, GL_TRUE); } void -__indirect_glDisableVertexAttribArrayARB(GLuint index) +__indirect_glDisableVertexAttribArray(GLuint index) { do_vertex_attrib_enable(index, GL_FALSE); } @@ -119,7 +119,7 @@ __indirect_glGetProgramLocalParameterdvARB(GLenum target, GLuint index, void -__indirect_glGetVertexAttribPointervNV(GLuint index, GLenum pname, +__indirect_glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid ** pointer) { struct glx_context *const gc = __glXGetCurrentContext(); @@ -193,7 +193,7 @@ get_vertex_attrib(struct glx_context * gc, unsigned vop, void -__indirect_glGetVertexAttribivARB(GLuint index, GLenum pname, GLint * params) +__indirect_glGetVertexAttribiv(GLuint index, GLenum pname, GLint * params) { struct glx_context *const gc = __glXGetCurrentContext(); Display *const dpy = gc->currentDpy; @@ -226,7 +226,7 @@ __indirect_glGetVertexAttribivARB(GLuint index, GLenum pname, GLint * params) void -__indirect_glGetVertexAttribfvARB(GLuint index, GLenum pname, +__indirect_glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat * params) { struct glx_context *const gc = __glXGetCurrentContext(); @@ -260,7 +260,7 @@ __indirect_glGetVertexAttribfvARB(GLuint index, GLenum pname, void -__indirect_glGetVertexAttribdvARB(GLuint index, GLenum pname, +__indirect_glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble * params) { struct glx_context *const gc = __glXGetCurrentContext(); diff --git a/src/glx/indirect_window_pos.c b/src/glx/indirect_window_pos.c index e97be3506d1..6c072bfd344 100644 --- a/src/glx/indirect_window_pos.c +++ b/src/glx/indirect_window_pos.c @@ -28,85 +28,85 @@ #include "indirect.h" void -__indirect_glWindowPos2dMESA(GLdouble x, GLdouble y) +__indirect_glWindowPos2d(GLdouble x, GLdouble y) { - __indirect_glWindowPos3fMESA(x, y, 0.0); + __indirect_glWindowPos3f(x, y, 0.0); } void -__indirect_glWindowPos2iMESA(GLint x, GLint y) +__indirect_glWindowPos2i(GLint x, GLint y) { - __indirect_glWindowPos3fMESA(x, y, 0.0); + __indirect_glWindowPos3f(x, y, 0.0); } void -__indirect_glWindowPos2fMESA(GLfloat x, GLfloat y) +__indirect_glWindowPos2f(GLfloat x, GLfloat y) { - __indirect_glWindowPos3fMESA(x, y, 0.0); + __indirect_glWindowPos3f(x, y, 0.0); } void -__indirect_glWindowPos2sMESA(GLshort x, GLshort y) +__indirect_glWindowPos2s(GLshort x, GLshort y) { - __indirect_glWindowPos3fMESA(x, y, 0.0); + __indirect_glWindowPos3f(x, y, 0.0); } void -__indirect_glWindowPos2dvMESA(const GLdouble * p) +__indirect_glWindowPos2dv(const GLdouble * p) { - __indirect_glWindowPos3fMESA(p[0], p[1], 0.0); + __indirect_glWindowPos3f(p[0], p[1], 0.0); } void -__indirect_glWindowPos2fvMESA(const GLfloat * p) +__indirect_glWindowPos2fv(const GLfloat * p) { - __indirect_glWindowPos3fMESA(p[0], p[1], 0.0); + __indirect_glWindowPos3f(p[0], p[1], 0.0); } void -__indirect_glWindowPos2ivMESA(const GLint * p) +__indirect_glWindowPos2iv(const GLint * p) { - __indirect_glWindowPos3fMESA(p[0], p[1], 0.0); + __indirect_glWindowPos3f(p[0], p[1], 0.0); } void -__indirect_glWindowPos2svMESA(const GLshort * p) +__indirect_glWindowPos2sv(const GLshort * p) { - __indirect_glWindowPos3fMESA(p[0], p[1], 0.0); + __indirect_glWindowPos3f(p[0], p[1], 0.0); } void -__indirect_glWindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z) +__indirect_glWindowPos3d(GLdouble x, GLdouble y, GLdouble z) { - __indirect_glWindowPos3fMESA(x, y, z); + __indirect_glWindowPos3f(x, y, z); } void -__indirect_glWindowPos3iMESA(GLint x, GLint y, GLint z) +__indirect_glWindowPos3i(GLint x, GLint y, GLint z) { - __indirect_glWindowPos3fMESA(x, y, z); + __indirect_glWindowPos3f(x, y, z); } void -__indirect_glWindowPos3sMESA(GLshort x, GLshort y, GLshort z) +__indirect_glWindowPos3s(GLshort x, GLshort y, GLshort z) { - __indirect_glWindowPos3fMESA(x, y, z); + __indirect_glWindowPos3f(x, y, z); } void -__indirect_glWindowPos3dvMESA(const GLdouble * p) +__indirect_glWindowPos3dv(const GLdouble * p) { - __indirect_glWindowPos3fMESA(p[0], p[1], p[2]); + __indirect_glWindowPos3f(p[0], p[1], p[2]); } void -__indirect_glWindowPos3ivMESA(const GLint * p) +__indirect_glWindowPos3iv(const GLint * p) { - __indirect_glWindowPos3fMESA(p[0], p[1], p[2]); + __indirect_glWindowPos3f(p[0], p[1], p[2]); } void -__indirect_glWindowPos3svMESA(const GLshort * p) +__indirect_glWindowPos3sv(const GLshort * p) { - __indirect_glWindowPos3fMESA(p[0], p[1], p[2]); + __indirect_glWindowPos3f(p[0], p[1], p[2]); } diff --git a/src/glx/tests/enum_sizes.cpp b/src/glx/tests/enum_sizes.cpp index 7ceeb031f68..20fc75879c0 100644 --- a/src/glx/tests/enum_sizes.cpp +++ b/src/glx/tests/enum_sizes.cpp @@ -515,19 +515,19 @@ TEST(InvalidEnumSizes, ConvolutionParameterfv) TEST(ValidEnumSizes, PointParameterfv) { - EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SIZE_MIN)); - EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SIZE_MIN_ARB)); - EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SIZE_MIN_SGIS)); - EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SIZE_MAX)); - EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SIZE_MAX_ARB)); - EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SIZE_MAX_SGIS)); - EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_FADE_THRESHOLD_SIZE)); - EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_FADE_THRESHOLD_SIZE_ARB)); - EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_FADE_THRESHOLD_SIZE_SGIS)); - EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SPRITE_R_MODE_NV)); - EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SPRITE_COORD_ORIGIN)); - EXPECT_EQ(3, __glPointParameterfvEXT_size(GL_POINT_DISTANCE_ATTENUATION)); - EXPECT_EQ(3, __glPointParameterfvEXT_size(GL_POINT_DISTANCE_ATTENUATION_ARB)); + EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SIZE_MIN)); + EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SIZE_MIN_ARB)); + EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SIZE_MIN_SGIS)); + EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SIZE_MAX)); + EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SIZE_MAX_ARB)); + EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SIZE_MAX_SGIS)); + EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_FADE_THRESHOLD_SIZE)); + EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_FADE_THRESHOLD_SIZE_ARB)); + EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_FADE_THRESHOLD_SIZE_SGIS)); + EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SPRITE_R_MODE_NV)); + EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SPRITE_COORD_ORIGIN)); + EXPECT_EQ(3, __glPointParameterfv_size(GL_POINT_DISTANCE_ATTENUATION)); + EXPECT_EQ(3, __glPointParameterfv_size(GL_POINT_DISTANCE_ATTENUATION_ARB)); } TEST(InvalidEnumSizes, PointParameterfv) @@ -549,7 +549,7 @@ TEST(InvalidEnumSizes, PointParameterfv) /* case GL_POINT_DISTANCE_ATTENUATION_ARB:*/ break; default: - EXPECT_EQ(0, __glPointParameterfvEXT_size(i)) << "i = 0x" << + EXPECT_EQ(0, __glPointParameterfv_size(i)) << "i = 0x" << std::setw(4) << std::setfill('0') << std::hex << i; } } diff --git a/src/glx/tests/indirect_api.cpp b/src/glx/tests/indirect_api.cpp index af9eca5a812..4291c965bd3 100644 --- a/src/glx/tests/indirect_api.cpp +++ b/src/glx/tests/indirect_api.cpp @@ -448,63 +448,63 @@ void __indirect_glResetMinmax(void) { } void __indirect_glSeparableFilter2D(void) { } void __indirect_glTexImage3D(void) { } void __indirect_glTexSubImage3D(void) { } -void __indirect_glActiveTextureARB(void) { } -void __indirect_glClientActiveTextureARB(void) { } -void __indirect_glMultiTexCoord1dARB(void) { } -void __indirect_glMultiTexCoord1dvARB(void) { } +void __indirect_glActiveTexture(void) { } +void __indirect_glClientActiveTexture(void) { } +void __indirect_glMultiTexCoord1d(void) { } +void __indirect_glMultiTexCoord1dv(void) { } void __indirect_glMultiTexCoord1fARB(void) { } void __indirect_glMultiTexCoord1fvARB(void) { } -void __indirect_glMultiTexCoord1iARB(void) { } -void __indirect_glMultiTexCoord1ivARB(void) { } -void __indirect_glMultiTexCoord1sARB(void) { } -void __indirect_glMultiTexCoord1svARB(void) { } -void __indirect_glMultiTexCoord2dARB(void) { } -void __indirect_glMultiTexCoord2dvARB(void) { } +void __indirect_glMultiTexCoord1i(void) { } +void __indirect_glMultiTexCoord1iv(void) { } +void __indirect_glMultiTexCoord1s(void) { } +void __indirect_glMultiTexCoord1sv(void) { } +void __indirect_glMultiTexCoord2d(void) { } +void __indirect_glMultiTexCoord2dv(void) { } void __indirect_glMultiTexCoord2fARB(void) { } void __indirect_glMultiTexCoord2fvARB(void) { } -void __indirect_glMultiTexCoord2iARB(void) { } -void __indirect_glMultiTexCoord2ivARB(void) { } -void __indirect_glMultiTexCoord2sARB(void) { } -void __indirect_glMultiTexCoord2svARB(void) { } -void __indirect_glMultiTexCoord3dARB(void) { } -void __indirect_glMultiTexCoord3dvARB(void) { } +void __indirect_glMultiTexCoord2i(void) { } +void __indirect_glMultiTexCoord2iv(void) { } +void __indirect_glMultiTexCoord2s(void) { } +void __indirect_glMultiTexCoord2sv(void) { } +void __indirect_glMultiTexCoord3d(void) { } +void __indirect_glMultiTexCoord3dv(void) { } void __indirect_glMultiTexCoord3fARB(void) { } void __indirect_glMultiTexCoord3fvARB(void) { } -void __indirect_glMultiTexCoord3iARB(void) { } -void __indirect_glMultiTexCoord3ivARB(void) { } -void __indirect_glMultiTexCoord3sARB(void) { } -void __indirect_glMultiTexCoord3svARB(void) { } -void __indirect_glMultiTexCoord4dARB(void) { } -void __indirect_glMultiTexCoord4dvARB(void) { } +void __indirect_glMultiTexCoord3i(void) { } +void __indirect_glMultiTexCoord3iv(void) { } +void __indirect_glMultiTexCoord3s(void) { } +void __indirect_glMultiTexCoord3sv(void) { } +void __indirect_glMultiTexCoord4d(void) { } +void __indirect_glMultiTexCoord4dv(void) { } void __indirect_glMultiTexCoord4fARB(void) { } void __indirect_glMultiTexCoord4fvARB(void) { } -void __indirect_glMultiTexCoord4iARB(void) { } -void __indirect_glMultiTexCoord4ivARB(void) { } -void __indirect_glMultiTexCoord4sARB(void) { } -void __indirect_glMultiTexCoord4svARB(void) { } -void __indirect_glLoadTransposeMatrixdARB(void) { } -void __indirect_glLoadTransposeMatrixfARB(void) { } -void __indirect_glMultTransposeMatrixdARB(void) { } -void __indirect_glMultTransposeMatrixfARB(void) { } -void __indirect_glSampleCoverageARB(void) { } -void __indirect_glCompressedTexImage1DARB(void) { } -void __indirect_glCompressedTexImage2DARB(void) { } -void __indirect_glCompressedTexImage3DARB(void) { } -void __indirect_glCompressedTexSubImage1DARB(void) { } -void __indirect_glCompressedTexSubImage2DARB(void) { } -void __indirect_glCompressedTexSubImage3DARB(void) { } -void __indirect_glGetCompressedTexImageARB(void) { } -void __indirect_glDisableVertexAttribArrayARB(void) { } -void __indirect_glEnableVertexAttribArrayARB(void) { } +void __indirect_glMultiTexCoord4i(void) { } +void __indirect_glMultiTexCoord4iv(void) { } +void __indirect_glMultiTexCoord4s(void) { } +void __indirect_glMultiTexCoord4sv(void) { } +void __indirect_glLoadTransposeMatrixd(void) { } +void __indirect_glLoadTransposeMatrixf(void) { } +void __indirect_glMultTransposeMatrixd(void) { } +void __indirect_glMultTransposeMatrixf(void) { } +void __indirect_glSampleCoverage(void) { } +void __indirect_glCompressedTexImage1D(void) { } +void __indirect_glCompressedTexImage2D(void) { } +void __indirect_glCompressedTexImage3D(void) { } +void __indirect_glCompressedTexSubImage1D(void) { } +void __indirect_glCompressedTexSubImage2D(void) { } +void __indirect_glCompressedTexSubImage3D(void) { } +void __indirect_glGetCompressedTexImage(void) { } +void __indirect_glDisableVertexAttribArray(void) { } +void __indirect_glEnableVertexAttribArray(void) { } void __indirect_glGetProgramEnvParameterdvARB(void) { } void __indirect_glGetProgramEnvParameterfvARB(void) { } void __indirect_glGetProgramLocalParameterdvARB(void) { } void __indirect_glGetProgramLocalParameterfvARB(void) { } void __indirect_glGetProgramStringARB(void) { } void __indirect_glGetProgramivARB(void) { } -void __indirect_glGetVertexAttribdvARB(void) { } -void __indirect_glGetVertexAttribfvARB(void) { } -void __indirect_glGetVertexAttribivARB(void) { } +void __indirect_glGetVertexAttribdv(void) { } +void __indirect_glGetVertexAttribfv(void) { } +void __indirect_glGetVertexAttribiv(void) { } void __indirect_glProgramEnvParameter4dARB(void) { } void __indirect_glProgramEnvParameter4dvARB(void) { } void __indirect_glProgramEnvParameter4fARB(void) { } @@ -514,53 +514,53 @@ void __indirect_glProgramLocalParameter4dvARB(void) { } void __indirect_glProgramLocalParameter4fARB(void) { } void __indirect_glProgramLocalParameter4fvARB(void) { } void __indirect_glProgramStringARB(void) { } -void __indirect_glVertexAttrib1dARB(void) { } -void __indirect_glVertexAttrib1dvARB(void) { } +void __indirect_glVertexAttrib1d(void) { } +void __indirect_glVertexAttrib1dv(void) { } void __indirect_glVertexAttrib1fARB(void) { } void __indirect_glVertexAttrib1fvARB(void) { } -void __indirect_glVertexAttrib1sARB(void) { } -void __indirect_glVertexAttrib1svARB(void) { } -void __indirect_glVertexAttrib2dARB(void) { } -void __indirect_glVertexAttrib2dvARB(void) { } +void __indirect_glVertexAttrib1s(void) { } +void __indirect_glVertexAttrib1sv(void) { } +void __indirect_glVertexAttrib2d(void) { } +void __indirect_glVertexAttrib2dv(void) { } void __indirect_glVertexAttrib2fARB(void) { } void __indirect_glVertexAttrib2fvARB(void) { } -void __indirect_glVertexAttrib2sARB(void) { } -void __indirect_glVertexAttrib2svARB(void) { } -void __indirect_glVertexAttrib3dARB(void) { } -void __indirect_glVertexAttrib3dvARB(void) { } +void __indirect_glVertexAttrib2s(void) { } +void __indirect_glVertexAttrib2sv(void) { } +void __indirect_glVertexAttrib3d(void) { } +void __indirect_glVertexAttrib3dv(void) { } void __indirect_glVertexAttrib3fARB(void) { } void __indirect_glVertexAttrib3fvARB(void) { } -void __indirect_glVertexAttrib3sARB(void) { } -void __indirect_glVertexAttrib3svARB(void) { } -void __indirect_glVertexAttrib4NbvARB(void) { } -void __indirect_glVertexAttrib4NivARB(void) { } -void __indirect_glVertexAttrib4NsvARB(void) { } -void __indirect_glVertexAttrib4NubARB(void) { } -void __indirect_glVertexAttrib4NubvARB(void) { } -void __indirect_glVertexAttrib4NuivARB(void) { } -void __indirect_glVertexAttrib4NusvARB(void) { } -void __indirect_glVertexAttrib4bvARB(void) { } -void __indirect_glVertexAttrib4dARB(void) { } -void __indirect_glVertexAttrib4dvARB(void) { } +void __indirect_glVertexAttrib3s(void) { } +void __indirect_glVertexAttrib3sv(void) { } +void __indirect_glVertexAttrib4Nbv(void) { } +void __indirect_glVertexAttrib4Niv(void) { } +void __indirect_glVertexAttrib4Nsv(void) { } +void __indirect_glVertexAttrib4Nub(void) { } +void __indirect_glVertexAttrib4Nubv(void) { } +void __indirect_glVertexAttrib4Nuiv(void) { } +void __indirect_glVertexAttrib4Nusv(void) { } +void __indirect_glVertexAttrib4bv(void) { } +void __indirect_glVertexAttrib4d(void) { } +void __indirect_glVertexAttrib4dv(void) { } void __indirect_glVertexAttrib4fARB(void) { } void __indirect_glVertexAttrib4fvARB(void) { } -void __indirect_glVertexAttrib4ivARB(void) { } -void __indirect_glVertexAttrib4sARB(void) { } -void __indirect_glVertexAttrib4svARB(void) { } -void __indirect_glVertexAttrib4ubvARB(void) { } -void __indirect_glVertexAttrib4uivARB(void) { } -void __indirect_glVertexAttrib4usvARB(void) { } -void __indirect_glVertexAttribPointerARB(void) { } -void __indirect_glBeginQueryARB(void) { } -void __indirect_glDeleteQueriesARB(void) { } -void __indirect_glEndQueryARB(void) { } -void __indirect_glGenQueriesARB(void) { } -void __indirect_glGetQueryObjectivARB(void) { } -void __indirect_glGetQueryObjectuivARB(void) { } -void __indirect_glGetQueryivARB(void) { } -void __indirect_glIsQueryARB(void) { } -void __indirect_glDrawBuffersARB(void) { } -void __indirect_glClampColorARB(void) { } +void __indirect_glVertexAttrib4iv(void) { } +void __indirect_glVertexAttrib4s(void) { } +void __indirect_glVertexAttrib4sv(void) { } +void __indirect_glVertexAttrib4ubv(void) { } +void __indirect_glVertexAttrib4uiv(void) { } +void __indirect_glVertexAttrib4usv(void) { } +void __indirect_glVertexAttribPointer(void) { } +void __indirect_glBeginQuery(void) { } +void __indirect_glDeleteQueries(void) { } +void __indirect_glEndQuery(void) { } +void __indirect_glGenQueries(void) { } +void __indirect_glGetQueryObjectiv(void) { } +void __indirect_glGetQueryObjectuiv(void) { } +void __indirect_glGetQueryiv(void) { } +void __indirect_glIsQuery(void) { } +void __indirect_glDrawBuffers(void) { } +void __indirect_glClampColor(void) { } void __indirect_glRenderbufferStorageMultisample(void) { } void __indirect_glSampleMaskSGIS(void) { } void __indirect_glSamplePatternSGIS(void) { } @@ -570,64 +570,64 @@ void __indirect_glIndexPointerEXT(void) { } void __indirect_glNormalPointerEXT(void) { } void __indirect_glTexCoordPointerEXT(void) { } void __indirect_glVertexPointerEXT(void) { } -void __indirect_glPointParameterfEXT(void) { } -void __indirect_glPointParameterfvEXT(void) { } -void __indirect_glSecondaryColor3bEXT(void) { } -void __indirect_glSecondaryColor3bvEXT(void) { } -void __indirect_glSecondaryColor3dEXT(void) { } -void __indirect_glSecondaryColor3dvEXT(void) { } +void __indirect_glPointParameterf(void) { } +void __indirect_glPointParameterfv(void) { } +void __indirect_glSecondaryColor3b(void) { } +void __indirect_glSecondaryColor3bv(void) { } +void __indirect_glSecondaryColor3d(void) { } +void __indirect_glSecondaryColor3dv(void) { } void __indirect_glSecondaryColor3fEXT(void) { } void __indirect_glSecondaryColor3fvEXT(void) { } -void __indirect_glSecondaryColor3iEXT(void) { } -void __indirect_glSecondaryColor3ivEXT(void) { } -void __indirect_glSecondaryColor3sEXT(void) { } -void __indirect_glSecondaryColor3svEXT(void) { } -void __indirect_glSecondaryColor3ubEXT(void) { } -void __indirect_glSecondaryColor3ubvEXT(void) { } -void __indirect_glSecondaryColor3uiEXT(void) { } -void __indirect_glSecondaryColor3uivEXT(void) { } -void __indirect_glSecondaryColor3usEXT(void) { } -void __indirect_glSecondaryColor3usvEXT(void) { } -void __indirect_glSecondaryColorPointerEXT(void) { } -void __indirect_glMultiDrawArraysEXT(void) { } +void __indirect_glSecondaryColor3i(void) { } +void __indirect_glSecondaryColor3iv(void) { } +void __indirect_glSecondaryColor3s(void) { } +void __indirect_glSecondaryColor3sv(void) { } +void __indirect_glSecondaryColor3ub(void) { } +void __indirect_glSecondaryColor3ubv(void) { } +void __indirect_glSecondaryColor3ui(void) { } +void __indirect_glSecondaryColor3uiv(void) { } +void __indirect_glSecondaryColor3us(void) { } +void __indirect_glSecondaryColor3usv(void) { } +void __indirect_glSecondaryColorPointer(void) { } +void __indirect_glMultiDrawArrays(void) { } void __indirect_glMultiDrawElementsEXT(void) { } -void __indirect_glFogCoordPointerEXT(void) { } -void __indirect_glFogCoorddEXT(void) { } -void __indirect_glFogCoorddvEXT(void) { } +void __indirect_glFogCoordPointer(void) { } +void __indirect_glFogCoordd(void) { } +void __indirect_glFogCoorddv(void) { } void __indirect_glFogCoordfEXT(void) { } void __indirect_glFogCoordfvEXT(void) { } -void __indirect_glBlendFuncSeparateEXT(void) { } -void __indirect_glWindowPos2dMESA(void) { } -void __indirect_glWindowPos2dvMESA(void) { } -void __indirect_glWindowPos2fMESA(void) { } -void __indirect_glWindowPos2fvMESA(void) { } -void __indirect_glWindowPos2iMESA(void) { } -void __indirect_glWindowPos2ivMESA(void) { } -void __indirect_glWindowPos2sMESA(void) { } -void __indirect_glWindowPos2svMESA(void) { } -void __indirect_glWindowPos3dMESA(void) { } -void __indirect_glWindowPos3dvMESA(void) { } -void __indirect_glWindowPos3fMESA(void) { } -void __indirect_glWindowPos3fvMESA(void) { } -void __indirect_glWindowPos3iMESA(void) { } -void __indirect_glWindowPos3ivMESA(void) { } -void __indirect_glWindowPos3sMESA(void) { } -void __indirect_glWindowPos3svMESA(void) { } +void __indirect_glBlendFuncSeparate(void) { } +void __indirect_glWindowPos2d(void) { } +void __indirect_glWindowPos2dv(void) { } +void __indirect_glWindowPos2f(void) { } +void __indirect_glWindowPos2fv(void) { } +void __indirect_glWindowPos2i(void) { } +void __indirect_glWindowPos2iv(void) { } +void __indirect_glWindowPos2s(void) { } +void __indirect_glWindowPos2sv(void) { } +void __indirect_glWindowPos3d(void) { } +void __indirect_glWindowPos3dv(void) { } +void __indirect_glWindowPos3f(void) { } +void __indirect_glWindowPos3fv(void) { } +void __indirect_glWindowPos3i(void) { } +void __indirect_glWindowPos3iv(void) { } +void __indirect_glWindowPos3s(void) { } +void __indirect_glWindowPos3sv(void) { } void __indirect_glAreProgramsResidentNV(void) { } -void __indirect_glBindProgramNV(void) { } -void __indirect_glDeleteProgramsNV(void) { } +void __indirect_glBindProgramARB(void) { } +void __indirect_glDeleteProgramsARB(void) { } void __indirect_glExecuteProgramNV(void) { } -void __indirect_glGenProgramsNV(void) { } +void __indirect_glGenProgramsARB(void) { } void __indirect_glGetProgramParameterdvNV(void) { } void __indirect_glGetProgramParameterfvNV(void) { } void __indirect_glGetProgramStringNV(void) { } void __indirect_glGetProgramivNV(void) { } void __indirect_glGetTrackMatrixivNV(void) { } -void __indirect_glGetVertexAttribPointervNV(void) { } +void __indirect_glGetVertexAttribPointerv(void) { } void __indirect_glGetVertexAttribdvNV(void) { } void __indirect_glGetVertexAttribfvNV(void) { } void __indirect_glGetVertexAttribivNV(void) { } -void __indirect_glIsProgramNV(void) { } +void __indirect_glIsProgramARB(void) { } void __indirect_glLoadProgramNV(void) { } void __indirect_glProgramParameters4dvNV(void) { } void __indirect_glProgramParameters4fvNV(void) { } @@ -673,8 +673,8 @@ void __indirect_glVertexAttribs4dvNV(void) { } void __indirect_glVertexAttribs4fvNV(void) { } void __indirect_glVertexAttribs4svNV(void) { } void __indirect_glVertexAttribs4ubvNV(void) { } -void __indirect_glPointParameteriNV(void) { } -void __indirect_glPointParameterivNV(void) { } +void __indirect_glPointParameteri(void) { } +void __indirect_glPointParameteriv(void) { } void __indirect_glActiveStencilFaceEXT(void) { } void __indirect_glGetProgramNamedParameterdvNV(void) { } void __indirect_glGetProgramNamedParameterfvNV(void) { } @@ -682,26 +682,26 @@ void __indirect_glProgramNamedParameter4dNV(void) { } void __indirect_glProgramNamedParameter4dvNV(void) { } void __indirect_glProgramNamedParameter4fNV(void) { } void __indirect_glProgramNamedParameter4fvNV(void) { } -void __indirect_glBlendEquationSeparateEXT(void) { } -void __indirect_glBindFramebufferEXT(void) { } -void __indirect_glBindRenderbufferEXT(void) { } -void __indirect_glCheckFramebufferStatusEXT(void) { } -void __indirect_glDeleteFramebuffersEXT(void) { } -void __indirect_glDeleteRenderbuffersEXT(void) { } -void __indirect_glFramebufferRenderbufferEXT(void) { } -void __indirect_glFramebufferTexture1DEXT(void) { } -void __indirect_glFramebufferTexture2DEXT(void) { } -void __indirect_glFramebufferTexture3DEXT(void) { } -void __indirect_glGenFramebuffersEXT(void) { } -void __indirect_glGenRenderbuffersEXT(void) { } -void __indirect_glGenerateMipmapEXT(void) { } -void __indirect_glGetFramebufferAttachmentParameterivEXT(void) { } -void __indirect_glGetRenderbufferParameterivEXT(void) { } -void __indirect_glIsFramebufferEXT(void) { } -void __indirect_glIsRenderbufferEXT(void) { } -void __indirect_glRenderbufferStorageEXT(void) { } -void __indirect_glBlitFramebufferEXT(void) { } -void __indirect_glFramebufferTextureLayerEXT(void) { } +void __indirect_glBlendEquationSeparate(void) { } +void __indirect_glBindFramebuffer(void) { } +void __indirect_glBindRenderbuffer(void) { } +void __indirect_glCheckFramebufferStatus(void) { } +void __indirect_glDeleteFramebuffers(void) { } +void __indirect_glDeleteRenderbuffers(void) { } +void __indirect_glFramebufferRenderbuffer(void) { } +void __indirect_glFramebufferTexture1D(void) { } +void __indirect_glFramebufferTexture2D(void) { } +void __indirect_glFramebufferTexture3D(void) { } +void __indirect_glGenFramebuffers(void) { } +void __indirect_glGenRenderbuffers(void) { } +void __indirect_glGenerateMipmap(void) { } +void __indirect_glGetFramebufferAttachmentParameteriv(void) { } +void __indirect_glGetRenderbufferParameteriv(void) { } +void __indirect_glIsFramebuffer(void) { } +void __indirect_glIsRenderbuffer(void) { } +void __indirect_glRenderbufferStorage(void) { } +void __indirect_glBlitFramebuffer(void) { } +void __indirect_glFramebufferTextureLayer(void) { } } /*@}*/ @@ -1165,79 +1165,79 @@ TEST_F(IndirectAPI, OpenGL_20_is_nop) TEST_F(IndirectAPI, ARB_multitexture) { - EXPECT_EQ((_glapi_proc) __indirect_glActiveTextureARB, table[_gloffset_ActiveTextureARB]); - EXPECT_EQ((_glapi_proc) __indirect_glClientActiveTextureARB, table[_gloffset_ClientActiveTextureARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1dARB, table[_gloffset_MultiTexCoord1dARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1dvARB, table[_gloffset_MultiTexCoord1dvARB]); + EXPECT_EQ((_glapi_proc) __indirect_glActiveTexture, table[_gloffset_ActiveTexture]); + EXPECT_EQ((_glapi_proc) __indirect_glClientActiveTexture, table[_gloffset_ClientActiveTexture]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1d, table[_gloffset_MultiTexCoord1d]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1dv, table[_gloffset_MultiTexCoord1dv]); EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1fARB, table[_gloffset_MultiTexCoord1fARB]); EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1fvARB, table[_gloffset_MultiTexCoord1fvARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1iARB, table[_gloffset_MultiTexCoord1iARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1ivARB, table[_gloffset_MultiTexCoord1ivARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1sARB, table[_gloffset_MultiTexCoord1sARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1svARB, table[_gloffset_MultiTexCoord1svARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2dARB, table[_gloffset_MultiTexCoord2dARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2dvARB, table[_gloffset_MultiTexCoord2dvARB]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1i, table[_gloffset_MultiTexCoord1i]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1iv, table[_gloffset_MultiTexCoord1iv]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1s, table[_gloffset_MultiTexCoord1s]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1sv, table[_gloffset_MultiTexCoord1sv]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2d, table[_gloffset_MultiTexCoord2d]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2dv, table[_gloffset_MultiTexCoord2dv]); EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2fARB, table[_gloffset_MultiTexCoord2fARB]); EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2fvARB, table[_gloffset_MultiTexCoord2fvARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2iARB, table[_gloffset_MultiTexCoord2iARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2ivARB, table[_gloffset_MultiTexCoord2ivARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2sARB, table[_gloffset_MultiTexCoord2sARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2svARB, table[_gloffset_MultiTexCoord2svARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3dARB, table[_gloffset_MultiTexCoord3dARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3dvARB, table[_gloffset_MultiTexCoord3dvARB]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2i, table[_gloffset_MultiTexCoord2i]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2iv, table[_gloffset_MultiTexCoord2iv]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2s, table[_gloffset_MultiTexCoord2s]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2sv, table[_gloffset_MultiTexCoord2sv]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3d, table[_gloffset_MultiTexCoord3d]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3dv, table[_gloffset_MultiTexCoord3dv]); EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3fARB, table[_gloffset_MultiTexCoord3fARB]); EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3fvARB, table[_gloffset_MultiTexCoord3fvARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3iARB, table[_gloffset_MultiTexCoord3iARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3ivARB, table[_gloffset_MultiTexCoord3ivARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3sARB, table[_gloffset_MultiTexCoord3sARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3svARB, table[_gloffset_MultiTexCoord3svARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4dARB, table[_gloffset_MultiTexCoord4dARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4dvARB, table[_gloffset_MultiTexCoord4dvARB]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3i, table[_gloffset_MultiTexCoord3i]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3iv, table[_gloffset_MultiTexCoord3iv]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3s, table[_gloffset_MultiTexCoord3s]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3sv, table[_gloffset_MultiTexCoord3sv]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4d, table[_gloffset_MultiTexCoord4d]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4dv, table[_gloffset_MultiTexCoord4dv]); EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4fARB, table[_gloffset_MultiTexCoord4fARB]); EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4fvARB, table[_gloffset_MultiTexCoord4fvARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4iARB, table[_gloffset_MultiTexCoord4iARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4ivARB, table[_gloffset_MultiTexCoord4ivARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4sARB, table[_gloffset_MultiTexCoord4sARB]); - EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4svARB, table[_gloffset_MultiTexCoord4svARB]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4i, table[_gloffset_MultiTexCoord4i]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4iv, table[_gloffset_MultiTexCoord4iv]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4s, table[_gloffset_MultiTexCoord4s]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4sv, table[_gloffset_MultiTexCoord4sv]); } TEST_F(IndirectAPI, ARB_transpose_matrix) { - EXPECT_EQ((_glapi_proc) __indirect_glLoadTransposeMatrixdARB, table[_glapi_get_proc_offset("glLoadTransposeMatrixdARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glLoadTransposeMatrixfARB, table[_glapi_get_proc_offset("glLoadTransposeMatrixfARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glMultTransposeMatrixdARB, table[_glapi_get_proc_offset("glMultTransposeMatrixdARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glMultTransposeMatrixfARB, table[_glapi_get_proc_offset("glMultTransposeMatrixfARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glLoadTransposeMatrixd, table[_glapi_get_proc_offset("glLoadTransposeMatrixdARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glLoadTransposeMatrixf, table[_glapi_get_proc_offset("glLoadTransposeMatrixfARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glMultTransposeMatrixd, table[_glapi_get_proc_offset("glMultTransposeMatrixdARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glMultTransposeMatrixf, table[_glapi_get_proc_offset("glMultTransposeMatrixfARB")]); } TEST_F(IndirectAPI, ARB_multisample) { - EXPECT_EQ((_glapi_proc) __indirect_glSampleCoverageARB, table[_glapi_get_proc_offset("glSampleCoverageARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glSampleCoverage, table[_glapi_get_proc_offset("glSampleCoverageARB")]); } TEST_F(IndirectAPI, ARB_texture_compression) { - EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexImage1DARB, table[_glapi_get_proc_offset("glCompressedTexImage1DARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexImage2DARB, table[_glapi_get_proc_offset("glCompressedTexImage2DARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexImage3DARB, table[_glapi_get_proc_offset("glCompressedTexImage3DARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexSubImage1DARB, table[_glapi_get_proc_offset("glCompressedTexSubImage1DARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexSubImage2DARB, table[_glapi_get_proc_offset("glCompressedTexSubImage2DARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexSubImage3DARB, table[_glapi_get_proc_offset("glCompressedTexSubImage3DARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glGetCompressedTexImageARB, table[_glapi_get_proc_offset("glGetCompressedTexImageARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexImage1D, table[_glapi_get_proc_offset("glCompressedTexImage1DARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexImage2D, table[_glapi_get_proc_offset("glCompressedTexImage2DARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexImage3D, table[_glapi_get_proc_offset("glCompressedTexImage3DARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexSubImage1D, table[_glapi_get_proc_offset("glCompressedTexSubImage1DARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexSubImage2D, table[_glapi_get_proc_offset("glCompressedTexSubImage2DARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexSubImage3D, table[_glapi_get_proc_offset("glCompressedTexSubImage3DARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glGetCompressedTexImage, table[_glapi_get_proc_offset("glGetCompressedTexImageARB")]); } TEST_F(IndirectAPI, ARB_vertex_program) { - EXPECT_EQ((_glapi_proc) __indirect_glDisableVertexAttribArrayARB, table[_glapi_get_proc_offset("glDisableVertexAttribArrayARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glEnableVertexAttribArrayARB, table[_glapi_get_proc_offset("glEnableVertexAttribArrayARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glDisableVertexAttribArray, table[_glapi_get_proc_offset("glDisableVertexAttribArrayARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glEnableVertexAttribArray, table[_glapi_get_proc_offset("glEnableVertexAttribArrayARB")]); EXPECT_EQ((_glapi_proc) __indirect_glGetProgramEnvParameterdvARB, table[_glapi_get_proc_offset("glGetProgramEnvParameterdvARB")]); EXPECT_EQ((_glapi_proc) __indirect_glGetProgramEnvParameterfvARB, table[_glapi_get_proc_offset("glGetProgramEnvParameterfvARB")]); EXPECT_EQ((_glapi_proc) __indirect_glGetProgramLocalParameterdvARB, table[_glapi_get_proc_offset("glGetProgramLocalParameterdvARB")]); EXPECT_EQ((_glapi_proc) __indirect_glGetProgramLocalParameterfvARB, table[_glapi_get_proc_offset("glGetProgramLocalParameterfvARB")]); EXPECT_EQ((_glapi_proc) __indirect_glGetProgramStringARB, table[_glapi_get_proc_offset("glGetProgramStringARB")]); EXPECT_EQ((_glapi_proc) __indirect_glGetProgramivARB, table[_glapi_get_proc_offset("glGetProgramivARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribdvARB, table[_glapi_get_proc_offset("glGetVertexAttribdvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribfvARB, table[_glapi_get_proc_offset("glGetVertexAttribfvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribivARB, table[_glapi_get_proc_offset("glGetVertexAttribivARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribdv, table[_glapi_get_proc_offset("glGetVertexAttribdvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribfv, table[_glapi_get_proc_offset("glGetVertexAttribfvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribiv, table[_glapi_get_proc_offset("glGetVertexAttribivARB")]); EXPECT_EQ((_glapi_proc) __indirect_glProgramEnvParameter4dARB, table[_glapi_get_proc_offset("glProgramEnvParameter4dARB")]); EXPECT_EQ((_glapi_proc) __indirect_glProgramEnvParameter4dvARB, table[_glapi_get_proc_offset("glProgramEnvParameter4dvARB")]); EXPECT_EQ((_glapi_proc) __indirect_glProgramEnvParameter4fARB, table[_glapi_get_proc_offset("glProgramEnvParameter4fARB")]); @@ -1247,65 +1247,65 @@ TEST_F(IndirectAPI, ARB_vertex_program) EXPECT_EQ((_glapi_proc) __indirect_glProgramLocalParameter4fARB, table[_glapi_get_proc_offset("glProgramLocalParameter4fARB")]); EXPECT_EQ((_glapi_proc) __indirect_glProgramLocalParameter4fvARB, table[_glapi_get_proc_offset("glProgramLocalParameter4fvARB")]); EXPECT_EQ((_glapi_proc) __indirect_glProgramStringARB, table[_glapi_get_proc_offset("glProgramStringARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1dARB, table[_glapi_get_proc_offset("glVertexAttrib1dARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1dvARB, table[_glapi_get_proc_offset("glVertexAttrib1dvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1d, table[_glapi_get_proc_offset("glVertexAttrib1dARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1dv, table[_glapi_get_proc_offset("glVertexAttrib1dvARB")]); EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1fARB, table[_glapi_get_proc_offset("glVertexAttrib1fARB")]); EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1fvARB, table[_glapi_get_proc_offset("glVertexAttrib1fvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1sARB, table[_glapi_get_proc_offset("glVertexAttrib1sARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1svARB, table[_glapi_get_proc_offset("glVertexAttrib1svARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2dARB, table[_glapi_get_proc_offset("glVertexAttrib2dARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2dvARB, table[_glapi_get_proc_offset("glVertexAttrib2dvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1s, table[_glapi_get_proc_offset("glVertexAttrib1sARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1sv, table[_glapi_get_proc_offset("glVertexAttrib1svARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2d, table[_glapi_get_proc_offset("glVertexAttrib2dARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2dv, table[_glapi_get_proc_offset("glVertexAttrib2dvARB")]); EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2fARB, table[_glapi_get_proc_offset("glVertexAttrib2fARB")]); EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2fvARB, table[_glapi_get_proc_offset("glVertexAttrib2fvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2sARB, table[_glapi_get_proc_offset("glVertexAttrib2sARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2svARB, table[_glapi_get_proc_offset("glVertexAttrib2svARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3dARB, table[_glapi_get_proc_offset("glVertexAttrib3dARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3dvARB, table[_glapi_get_proc_offset("glVertexAttrib3dvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2s, table[_glapi_get_proc_offset("glVertexAttrib2sARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2sv, table[_glapi_get_proc_offset("glVertexAttrib2svARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3d, table[_glapi_get_proc_offset("glVertexAttrib3dARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3dv, table[_glapi_get_proc_offset("glVertexAttrib3dvARB")]); EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3fARB, table[_glapi_get_proc_offset("glVertexAttrib3fARB")]); EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3fvARB, table[_glapi_get_proc_offset("glVertexAttrib3fvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3sARB, table[_glapi_get_proc_offset("glVertexAttrib3sARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3svARB, table[_glapi_get_proc_offset("glVertexAttrib3svARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NbvARB, table[_glapi_get_proc_offset("glVertexAttrib4NbvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NivARB, table[_glapi_get_proc_offset("glVertexAttrib4NivARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NsvARB, table[_glapi_get_proc_offset("glVertexAttrib4NsvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NubARB, table[_glapi_get_proc_offset("glVertexAttrib4NubARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NubvARB, table[_glapi_get_proc_offset("glVertexAttrib4NubvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NuivARB, table[_glapi_get_proc_offset("glVertexAttrib4NuivARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NusvARB, table[_glapi_get_proc_offset("glVertexAttrib4NusvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4bvARB, table[_glapi_get_proc_offset("glVertexAttrib4bvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4dARB, table[_glapi_get_proc_offset("glVertexAttrib4dARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4dvARB, table[_glapi_get_proc_offset("glVertexAttrib4dvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3s, table[_glapi_get_proc_offset("glVertexAttrib3sARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3sv, table[_glapi_get_proc_offset("glVertexAttrib3svARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Nbv, table[_glapi_get_proc_offset("glVertexAttrib4NbvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Niv, table[_glapi_get_proc_offset("glVertexAttrib4NivARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Nsv, table[_glapi_get_proc_offset("glVertexAttrib4NsvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Nub, table[_glapi_get_proc_offset("glVertexAttrib4NubARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Nubv, table[_glapi_get_proc_offset("glVertexAttrib4NubvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Nuiv, table[_glapi_get_proc_offset("glVertexAttrib4NuivARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Nusv, table[_glapi_get_proc_offset("glVertexAttrib4NusvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4bv, table[_glapi_get_proc_offset("glVertexAttrib4bvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4d, table[_glapi_get_proc_offset("glVertexAttrib4dARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4dv, table[_glapi_get_proc_offset("glVertexAttrib4dvARB")]); EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4fARB, table[_glapi_get_proc_offset("glVertexAttrib4fARB")]); EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4fvARB, table[_glapi_get_proc_offset("glVertexAttrib4fvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4ivARB, table[_glapi_get_proc_offset("glVertexAttrib4ivARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4sARB, table[_glapi_get_proc_offset("glVertexAttrib4sARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4svARB, table[_glapi_get_proc_offset("glVertexAttrib4svARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4ubvARB, table[_glapi_get_proc_offset("glVertexAttrib4ubvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4uivARB, table[_glapi_get_proc_offset("glVertexAttrib4uivARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4usvARB, table[_glapi_get_proc_offset("glVertexAttrib4usvARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glVertexAttribPointerARB, table[_glapi_get_proc_offset("glVertexAttribPointerARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4iv, table[_glapi_get_proc_offset("glVertexAttrib4ivARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4s, table[_glapi_get_proc_offset("glVertexAttrib4sARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4sv, table[_glapi_get_proc_offset("glVertexAttrib4svARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4ubv, table[_glapi_get_proc_offset("glVertexAttrib4ubvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4uiv, table[_glapi_get_proc_offset("glVertexAttrib4uivARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4usv, table[_glapi_get_proc_offset("glVertexAttrib4usvARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glVertexAttribPointer, table[_glapi_get_proc_offset("glVertexAttribPointerARB")]); } TEST_F(IndirectAPI, ARB_occlusion_query) { - EXPECT_EQ((_glapi_proc) __indirect_glBeginQueryARB, table[_glapi_get_proc_offset("glBeginQueryARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glDeleteQueriesARB, table[_glapi_get_proc_offset("glDeleteQueriesARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glEndQueryARB, table[_glapi_get_proc_offset("glEndQueryARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glGenQueriesARB, table[_glapi_get_proc_offset("glGenQueriesARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glGetQueryObjectivARB, table[_glapi_get_proc_offset("glGetQueryObjectivARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glGetQueryObjectuivARB, table[_glapi_get_proc_offset("glGetQueryObjectuivARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glGetQueryivARB, table[_glapi_get_proc_offset("glGetQueryivARB")]); - EXPECT_EQ((_glapi_proc) __indirect_glIsQueryARB, table[_glapi_get_proc_offset("glIsQueryARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glBeginQuery, table[_glapi_get_proc_offset("glBeginQueryARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glDeleteQueries, table[_glapi_get_proc_offset("glDeleteQueriesARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glEndQuery, table[_glapi_get_proc_offset("glEndQueryARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glGenQueries, table[_glapi_get_proc_offset("glGenQueriesARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glGetQueryObjectiv, table[_glapi_get_proc_offset("glGetQueryObjectivARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glGetQueryObjectuiv, table[_glapi_get_proc_offset("glGetQueryObjectuivARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glGetQueryiv, table[_glapi_get_proc_offset("glGetQueryivARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glIsQuery, table[_glapi_get_proc_offset("glIsQueryARB")]); } TEST_F(IndirectAPI, ARB_draw_buffers) { - EXPECT_EQ((_glapi_proc) __indirect_glDrawBuffersARB, table[_glapi_get_proc_offset("glDrawBuffersARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glDrawBuffers, table[_glapi_get_proc_offset("glDrawBuffersARB")]); } TEST_F(IndirectAPI, ARB_color_buffer_float) { - EXPECT_EQ((_glapi_proc) __indirect_glClampColorARB, table[_glapi_get_proc_offset("glClampColorARB")]); + EXPECT_EQ((_glapi_proc) __indirect_glClampColor, table[_glapi_get_proc_offset("glClampColorARB")]); } TEST_F(IndirectAPI, ARB_framebuffer_object) @@ -1331,88 +1331,88 @@ TEST_F(IndirectAPI, EXT_vertex_array) TEST_F(IndirectAPI, EXT_point_parameters) { - EXPECT_EQ((_glapi_proc) __indirect_glPointParameterfEXT, table[_glapi_get_proc_offset("glPointParameterfEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glPointParameterfvEXT, table[_glapi_get_proc_offset("glPointParameterfvEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glPointParameterf, table[_glapi_get_proc_offset("glPointParameterfEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glPointParameterfv, table[_glapi_get_proc_offset("glPointParameterfvEXT")]); } TEST_F(IndirectAPI, EXT_secondary_color) { - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3bEXT, table[_glapi_get_proc_offset("glSecondaryColor3bEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3bvEXT, table[_glapi_get_proc_offset("glSecondaryColor3bvEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3dEXT, table[_glapi_get_proc_offset("glSecondaryColor3dEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3dvEXT, table[_glapi_get_proc_offset("glSecondaryColor3dvEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3b, table[_glapi_get_proc_offset("glSecondaryColor3bEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3bv, table[_glapi_get_proc_offset("glSecondaryColor3bvEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3d, table[_glapi_get_proc_offset("glSecondaryColor3dEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3dv, table[_glapi_get_proc_offset("glSecondaryColor3dvEXT")]); EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3fEXT, table[_glapi_get_proc_offset("glSecondaryColor3fEXT")]); EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3fvEXT, table[_glapi_get_proc_offset("glSecondaryColor3fvEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3iEXT, table[_glapi_get_proc_offset("glSecondaryColor3iEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3ivEXT, table[_glapi_get_proc_offset("glSecondaryColor3ivEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3sEXT, table[_glapi_get_proc_offset("glSecondaryColor3sEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3svEXT, table[_glapi_get_proc_offset("glSecondaryColor3svEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3ubEXT, table[_glapi_get_proc_offset("glSecondaryColor3ubEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3ubvEXT, table[_glapi_get_proc_offset("glSecondaryColor3ubvEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3uiEXT, table[_glapi_get_proc_offset("glSecondaryColor3uiEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3uivEXT, table[_glapi_get_proc_offset("glSecondaryColor3uivEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3usEXT, table[_glapi_get_proc_offset("glSecondaryColor3usEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3usvEXT, table[_glapi_get_proc_offset("glSecondaryColor3usvEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColorPointerEXT, table[_glapi_get_proc_offset("glSecondaryColorPointerEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3i, table[_glapi_get_proc_offset("glSecondaryColor3iEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3iv, table[_glapi_get_proc_offset("glSecondaryColor3ivEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3s, table[_glapi_get_proc_offset("glSecondaryColor3sEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3sv, table[_glapi_get_proc_offset("glSecondaryColor3svEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3ub, table[_glapi_get_proc_offset("glSecondaryColor3ubEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3ubv, table[_glapi_get_proc_offset("glSecondaryColor3ubvEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3ui, table[_glapi_get_proc_offset("glSecondaryColor3uiEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3uiv, table[_glapi_get_proc_offset("glSecondaryColor3uivEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3us, table[_glapi_get_proc_offset("glSecondaryColor3usEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3usv, table[_glapi_get_proc_offset("glSecondaryColor3usvEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColorPointer, table[_glapi_get_proc_offset("glSecondaryColorPointerEXT")]); } TEST_F(IndirectAPI, EXT_multi_draw_arrays) { - EXPECT_EQ((_glapi_proc) __indirect_glMultiDrawArraysEXT, table[_glapi_get_proc_offset("glMultiDrawArraysEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glMultiDrawArrays, table[_glapi_get_proc_offset("glMultiDrawArraysEXT")]); EXPECT_EQ((_glapi_proc) __indirect_glMultiDrawElementsEXT, table[_glapi_get_proc_offset("glMultiDrawElementsEXT")]); } TEST_F(IndirectAPI, EXT_fog_coord) { - EXPECT_EQ((_glapi_proc) __indirect_glFogCoordPointerEXT, table[_glapi_get_proc_offset("glFogCoordPointerEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glFogCoorddEXT, table[_glapi_get_proc_offset("glFogCoorddEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glFogCoorddvEXT, table[_glapi_get_proc_offset("glFogCoorddvEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glFogCoordPointer, table[_glapi_get_proc_offset("glFogCoordPointerEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glFogCoordd, table[_glapi_get_proc_offset("glFogCoorddEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glFogCoorddv, table[_glapi_get_proc_offset("glFogCoorddvEXT")]); EXPECT_EQ((_glapi_proc) __indirect_glFogCoordfEXT, table[_glapi_get_proc_offset("glFogCoordfEXT")]); EXPECT_EQ((_glapi_proc) __indirect_glFogCoordfvEXT, table[_glapi_get_proc_offset("glFogCoordfvEXT")]); } TEST_F(IndirectAPI, EXT_blend_func_separate) { - EXPECT_EQ((_glapi_proc) __indirect_glBlendFuncSeparateEXT, table[_glapi_get_proc_offset("glBlendFuncSeparateEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glBlendFuncSeparate, table[_glapi_get_proc_offset("glBlendFuncSeparateEXT")]); } TEST_F(IndirectAPI, MESA_window_pos) { - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2dMESA, table[_glapi_get_proc_offset("glWindowPos2dMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2dvMESA, table[_glapi_get_proc_offset("glWindowPos2dvMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2fMESA, table[_glapi_get_proc_offset("glWindowPos2fMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2fvMESA, table[_glapi_get_proc_offset("glWindowPos2fvMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2iMESA, table[_glapi_get_proc_offset("glWindowPos2iMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2ivMESA, table[_glapi_get_proc_offset("glWindowPos2ivMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2sMESA, table[_glapi_get_proc_offset("glWindowPos2sMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2svMESA, table[_glapi_get_proc_offset("glWindowPos2svMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3dMESA, table[_glapi_get_proc_offset("glWindowPos3dMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3dvMESA, table[_glapi_get_proc_offset("glWindowPos3dvMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3fMESA, table[_glapi_get_proc_offset("glWindowPos3fMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3fvMESA, table[_glapi_get_proc_offset("glWindowPos3fvMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3iMESA, table[_glapi_get_proc_offset("glWindowPos3iMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3ivMESA, table[_glapi_get_proc_offset("glWindowPos3ivMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3sMESA, table[_glapi_get_proc_offset("glWindowPos3sMESA")]); - EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3svMESA, table[_glapi_get_proc_offset("glWindowPos3svMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2d, table[_glapi_get_proc_offset("glWindowPos2dMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2dv, table[_glapi_get_proc_offset("glWindowPos2dvMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2f, table[_glapi_get_proc_offset("glWindowPos2fMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2fv, table[_glapi_get_proc_offset("glWindowPos2fvMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2i, table[_glapi_get_proc_offset("glWindowPos2iMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2iv, table[_glapi_get_proc_offset("glWindowPos2ivMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2s, table[_glapi_get_proc_offset("glWindowPos2sMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2sv, table[_glapi_get_proc_offset("glWindowPos2svMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3d, table[_glapi_get_proc_offset("glWindowPos3dMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3dv, table[_glapi_get_proc_offset("glWindowPos3dvMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3f, table[_glapi_get_proc_offset("glWindowPos3fMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3fv, table[_glapi_get_proc_offset("glWindowPos3fvMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3i, table[_glapi_get_proc_offset("glWindowPos3iMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3iv, table[_glapi_get_proc_offset("glWindowPos3ivMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3s, table[_glapi_get_proc_offset("glWindowPos3sMESA")]); + EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3sv, table[_glapi_get_proc_offset("glWindowPos3svMESA")]); } TEST_F(IndirectAPI, NV_vertex_program) { EXPECT_EQ((_glapi_proc) __indirect_glAreProgramsResidentNV, table[_glapi_get_proc_offset("glAreProgramsResidentNV")]); - EXPECT_EQ((_glapi_proc) __indirect_glBindProgramNV, table[_glapi_get_proc_offset("glBindProgramNV")]); - EXPECT_EQ((_glapi_proc) __indirect_glDeleteProgramsNV, table[_glapi_get_proc_offset("glDeleteProgramsNV")]); + EXPECT_EQ((_glapi_proc) __indirect_glBindProgramARB, table[_glapi_get_proc_offset("glBindProgramNV")]); + EXPECT_EQ((_glapi_proc) __indirect_glDeleteProgramsARB, table[_glapi_get_proc_offset("glDeleteProgramsNV")]); EXPECT_EQ((_glapi_proc) __indirect_glExecuteProgramNV, table[_glapi_get_proc_offset("glExecuteProgramNV")]); - EXPECT_EQ((_glapi_proc) __indirect_glGenProgramsNV, table[_glapi_get_proc_offset("glGenProgramsNV")]); + EXPECT_EQ((_glapi_proc) __indirect_glGenProgramsARB, table[_glapi_get_proc_offset("glGenProgramsNV")]); EXPECT_EQ((_glapi_proc) __indirect_glGetProgramParameterdvNV, table[_glapi_get_proc_offset("glGetProgramParameterdvNV")]); EXPECT_EQ((_glapi_proc) __indirect_glGetProgramParameterfvNV, table[_glapi_get_proc_offset("glGetProgramParameterfvNV")]); EXPECT_EQ((_glapi_proc) __indirect_glGetProgramStringNV, table[_glapi_get_proc_offset("glGetProgramStringNV")]); EXPECT_EQ((_glapi_proc) __indirect_glGetProgramivNV, table[_glapi_get_proc_offset("glGetProgramivNV")]); EXPECT_EQ((_glapi_proc) __indirect_glGetTrackMatrixivNV, table[_glapi_get_proc_offset("glGetTrackMatrixivNV")]); - EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribPointervNV, table[_glapi_get_proc_offset("glGetVertexAttribPointervNV")]); + EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribPointerv, table[_glapi_get_proc_offset("glGetVertexAttribPointervNV")]); EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribdvNV, table[_glapi_get_proc_offset("glGetVertexAttribdvNV")]); EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribfvNV, table[_glapi_get_proc_offset("glGetVertexAttribfvNV")]); EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribivNV, table[_glapi_get_proc_offset("glGetVertexAttribivNV")]); - EXPECT_EQ((_glapi_proc) __indirect_glIsProgramNV, table[_glapi_get_proc_offset("glIsProgramNV")]); + EXPECT_EQ((_glapi_proc) __indirect_glIsProgramARB, table[_glapi_get_proc_offset("glIsProgramNV")]); EXPECT_EQ((_glapi_proc) __indirect_glLoadProgramNV, table[_glapi_get_proc_offset("glLoadProgramNV")]); EXPECT_EQ((_glapi_proc) __indirect_glProgramParameters4dvNV, table[_glapi_get_proc_offset("glProgramParameters4dvNV")]); EXPECT_EQ((_glapi_proc) __indirect_glProgramParameters4fvNV, table[_glapi_get_proc_offset("glProgramParameters4fvNV")]); @@ -1462,8 +1462,8 @@ TEST_F(IndirectAPI, NV_vertex_program) TEST_F(IndirectAPI, NV_point_sprite) { - EXPECT_EQ((_glapi_proc) __indirect_glPointParameteriNV, table[_glapi_get_proc_offset("glPointParameteriNV")]); - EXPECT_EQ((_glapi_proc) __indirect_glPointParameterivNV, table[_glapi_get_proc_offset("glPointParameterivNV")]); + EXPECT_EQ((_glapi_proc) __indirect_glPointParameteri, table[_glapi_get_proc_offset("glPointParameteriNV")]); + EXPECT_EQ((_glapi_proc) __indirect_glPointParameteriv, table[_glapi_get_proc_offset("glPointParameterivNV")]); } TEST_F(IndirectAPI, EXT_stencil_two_side) @@ -1483,36 +1483,36 @@ TEST_F(IndirectAPI, NV_fragment_program) TEST_F(IndirectAPI, EXT_blend_equation_separate) { - EXPECT_EQ((_glapi_proc) __indirect_glBlendEquationSeparateEXT, table[_glapi_get_proc_offset("glBlendEquationSeparateEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glBlendEquationSeparate, table[_glapi_get_proc_offset("glBlendEquationSeparateEXT")]); } TEST_F(IndirectAPI, EXT_framebuffer_object) { - EXPECT_EQ((_glapi_proc) __indirect_glBindFramebufferEXT, table[_glapi_get_proc_offset("glBindFramebufferEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glBindRenderbufferEXT, table[_glapi_get_proc_offset("glBindRenderbufferEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glCheckFramebufferStatusEXT, table[_glapi_get_proc_offset("glCheckFramebufferStatusEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glDeleteFramebuffersEXT, table[_glapi_get_proc_offset("glDeleteFramebuffersEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glDeleteRenderbuffersEXT, table[_glapi_get_proc_offset("glDeleteRenderbuffersEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glFramebufferRenderbufferEXT, table[_glapi_get_proc_offset("glFramebufferRenderbufferEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTexture1DEXT, table[_glapi_get_proc_offset("glFramebufferTexture1DEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTexture2DEXT, table[_glapi_get_proc_offset("glFramebufferTexture2DEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTexture3DEXT, table[_glapi_get_proc_offset("glFramebufferTexture3DEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glGenFramebuffersEXT, table[_glapi_get_proc_offset("glGenFramebuffersEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glGenRenderbuffersEXT, table[_glapi_get_proc_offset("glGenRenderbuffersEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glGenerateMipmapEXT, table[_glapi_get_proc_offset("glGenerateMipmapEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glGetFramebufferAttachmentParameterivEXT, table[_glapi_get_proc_offset("glGetFramebufferAttachmentParameterivEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glGetRenderbufferParameterivEXT, table[_glapi_get_proc_offset("glGetRenderbufferParameterivEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glIsFramebufferEXT, table[_glapi_get_proc_offset("glIsFramebufferEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glIsRenderbufferEXT, table[_glapi_get_proc_offset("glIsRenderbufferEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glRenderbufferStorageEXT, table[_glapi_get_proc_offset("glRenderbufferStorageEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glBindFramebuffer, table[_glapi_get_proc_offset("glBindFramebufferEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glBindRenderbuffer, table[_glapi_get_proc_offset("glBindRenderbufferEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glCheckFramebufferStatus, table[_glapi_get_proc_offset("glCheckFramebufferStatusEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glDeleteFramebuffers, table[_glapi_get_proc_offset("glDeleteFramebuffersEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glDeleteRenderbuffers, table[_glapi_get_proc_offset("glDeleteRenderbuffersEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glFramebufferRenderbuffer, table[_glapi_get_proc_offset("glFramebufferRenderbufferEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTexture1D, table[_glapi_get_proc_offset("glFramebufferTexture1DEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTexture2D, table[_glapi_get_proc_offset("glFramebufferTexture2DEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTexture3D, table[_glapi_get_proc_offset("glFramebufferTexture3DEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glGenFramebuffers, table[_glapi_get_proc_offset("glGenFramebuffersEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glGenRenderbuffers, table[_glapi_get_proc_offset("glGenRenderbuffersEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glGenerateMipmap, table[_glapi_get_proc_offset("glGenerateMipmapEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glGetFramebufferAttachmentParameteriv, table[_glapi_get_proc_offset("glGetFramebufferAttachmentParameterivEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glGetRenderbufferParameteriv, table[_glapi_get_proc_offset("glGetRenderbufferParameterivEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glIsFramebuffer, table[_glapi_get_proc_offset("glIsFramebufferEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glIsRenderbuffer, table[_glapi_get_proc_offset("glIsRenderbufferEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glRenderbufferStorage, table[_glapi_get_proc_offset("glRenderbufferStorageEXT")]); } TEST_F(IndirectAPI, EXT_framebuffer_blit) { - EXPECT_EQ((_glapi_proc) __indirect_glBlitFramebufferEXT, table[_glapi_get_proc_offset("glBlitFramebufferEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glBlitFramebuffer, table[_glapi_get_proc_offset("glBlitFramebufferEXT")]); } TEST_F(IndirectAPI, EXT_texture_array) { - EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTextureLayerEXT, table[_glapi_get_proc_offset("glFramebufferTextureLayerEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTextureLayer, table[_glapi_get_proc_offset("glFramebufferTextureLayerEXT")]); } diff --git a/src/mapi/glapi/gen/APPLE_vertex_array_object.xml b/src/mapi/glapi/gen/APPLE_vertex_array_object.xml index 2bffc4e084d..5eb53b14e9f 100644 --- a/src/mapi/glapi/gen/APPLE_vertex_array_object.xml +++ b/src/mapi/glapi/gen/APPLE_vertex_array_object.xml @@ -10,9 +10,9 @@ <param name="array" type="GLuint"/> </function> - <function name="DeleteVertexArraysAPPLE" offset="assign" static_dispatch="false"> + <function name="DeleteVertexArraysAPPLE" static_dispatch="false" alias="DeleteVertexArrays"> <param name="n" type="GLsizei"/> - <param name="arrays" type="const GLuint *" count="n"/> + <param name="arrays" type="const GLuint *"/> </function> <function name="GenVertexArraysAPPLE" offset="assign" @@ -21,7 +21,7 @@ <param name="arrays" type="GLuint *" count="n" output="true"/> </function> - <function name="IsVertexArrayAPPLE" offset="assign" static_dispatch="false"> + <function name="IsVertexArrayAPPLE" static_dispatch="false" alias="IsVertexArray"> <param name="array" type="GLuint"/> <return type="GLboolean"/> </function> diff --git a/src/mapi/glapi/gen/ARB_color_buffer_float.xml b/src/mapi/glapi/gen/ARB_color_buffer_float.xml index 7acf271558e..edc10436e44 100644 --- a/src/mapi/glapi/gen/ARB_color_buffer_float.xml +++ b/src/mapi/glapi/gen/ARB_color_buffer_float.xml @@ -14,10 +14,9 @@ <enum name="CLAMP_READ_COLOR_ARB" value="0x891C"/> <enum name="FIXED_ONLY_ARB" value="0x891D"/> - <function name="ClampColorARB" offset="assign"> + <function name="ClampColorARB" alias="ClampColor"> <param name="target" type="GLenum"/> <param name="clamp" type="GLenum"/> - <glx rop="234"/> </function> </category> diff --git a/src/mapi/glapi/gen/ARB_draw_buffers.xml b/src/mapi/glapi/gen/ARB_draw_buffers.xml index 3d47172673a..45184eb04f9 100644 --- a/src/mapi/glapi/gen/ARB_draw_buffers.xml +++ b/src/mapi/glapi/gen/ARB_draw_buffers.xml @@ -55,10 +55,9 @@ <size name="Get" mode="get"/> </enum> - <function name="DrawBuffersARB" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="bufs" type="const GLenum *" count="n"/> - <glx rop="233" large="true"/> + <function name="DrawBuffersARB" alias="DrawBuffers"> + <param name="n" type="GLsizei"/> + <param name="bufs" type="const GLenum *"/> </function> </category> @@ -115,7 +114,7 @@ <size name="Get" mode="get"/> </enum> - <function name="DrawBuffersATI" alias="DrawBuffersARB"> + <function name="DrawBuffersATI" alias="DrawBuffers"> <param name="n" type="GLsizei" counter="true"/> <param name="bufs" type="const GLenum *" count="n"/> </function> diff --git a/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml b/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml index c08017aa552..0b6947cc5f3 100644 --- a/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml +++ b/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml @@ -8,25 +8,24 @@ <category name="GL_ARB_draw_buffers_blend" number="69"> - <function name="BlendEquationiARB" offset="assign" mesa_name="-ARB"> + <function name="BlendEquationiARB" offset="assign"> <param name="buf" type="GLuint"/> <param name="mode" type="GLenum"/> </function> - <function name="BlendEquationSeparateiARB" offset="assign" - mesa_name="-ARB"> + <function name="BlendEquationSeparateiARB" offset="assign"> <param name="buf" type="GLuint"/> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> </function> - <function name="BlendFunciARB" offset="assign" mesa_name="-ARB"> + <function name="BlendFunciARB" offset="assign"> <param name="buf" type="GLuint"/> <param name="src" type="GLenum"/> <param name="dst" type="GLenum"/> </function> - <function name="BlendFuncSeparateiARB" offset="assign" mesa_name="-ARB"> + <function name="BlendFuncSeparateiARB" offset="assign"> <param name="buf" type="GLuint"/> <param name="srcRGB" type="GLenum"/> <param name="dstRGB" type="GLenum"/> diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml index c9649aced8d..87eda93eb5a 100644 --- a/src/mapi/glapi/gen/ARB_framebuffer_object.xml +++ b/src/mapi/glapi/gen/ARB_framebuffer_object.xml @@ -140,33 +140,38 @@ - <function name="IsRenderbuffer" alias="IsRenderbufferEXT" es2="2.0"> + <function name="IsRenderbuffer" es2="2.0" offset="assign"> <param name="renderbuffer" type="GLuint"/> <return type="GLboolean"/> + <glx vendorpriv="1422"/> </function> - <function name="BindRenderbuffer" alias="BindRenderbufferEXT" es2="2.0"> + <function name="BindRenderbuffer" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> + <glx rop="4316"/> </function> - <function name="DeleteRenderbuffers" alias="DeleteRenderbuffersEXT" - es2="2.0"> + <function name="DeleteRenderbuffers" + es2="2.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="const GLuint *" count="n"/> + <glx rop="4317"/> </function> - <function name="GenRenderbuffers" alias="GenRenderbuffersEXT" es2="2.0"> + <function name="GenRenderbuffers" es2="2.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="GLuint *" count="n" output="true"/> + <glx vendorpriv="1423" always_array="true"/> </function> - <function name="RenderbufferStorage" alias="RenderbufferStorageEXT" - es2="2.0"> + <function name="RenderbufferStorage" + es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> + <glx rop="4318"/> </function> <function name="RenderbufferStorageMultisample" offset="assign" es2="3.0"> @@ -178,91 +183,101 @@ <glx rop="4331"/> </function> - <function name="GetRenderbufferParameteriv" - alias="GetRenderbufferParameterivEXT" es2="2.0"> + <function name="GetRenderbufferParameteriv" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> + <glx vendorpriv="1424"/> </function> - <function name="IsFramebuffer" alias="IsFramebufferEXT" es2="2.0"> + <function name="IsFramebuffer" es2="2.0" offset="assign"> <param name="framebuffer" type="GLuint"/> <return type="GLboolean"/> + <glx vendorpriv="1425"/> </function> - <function name="BindFramebuffer" alias="BindFramebufferEXT" es2="2.0"> + <function name="BindFramebuffer" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="framebuffer" type="GLuint"/> + <glx rop="4319"/> </function> - <function name="DeleteFramebuffers" alias="DeleteFramebuffersEXT" - es2="2.0"> + <function name="DeleteFramebuffers" + es2="2.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="framebuffers" type="const GLuint *" count="n"/> + <glx rop="4320"/> </function> - <function name="GenFramebuffers" alias="GenFramebuffersEXT" es2="2.0"> + <function name="GenFramebuffers" es2="2.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="framebuffers" type="GLuint *" count="n" output="true"/> + <glx vendorpriv="1426" always_array="true"/> </function> - <function name="CheckFramebufferStatus" alias="CheckFramebufferStatusEXT" - es2="2.0"> + <function name="CheckFramebufferStatus" + es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <return type="GLenum"/> + <glx vendorpriv="1427"/> </function> - <function name="FramebufferTexture1D" alias="FramebufferTexture1DEXT"> + <function name="FramebufferTexture1D" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> + <glx rop="4321"/> </function> - <function name="FramebufferTexture2D" alias="FramebufferTexture2DEXT" - es2="2.0"> + <function name="FramebufferTexture2D" + es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> + <glx rop="4322"/> </function> - <function name="FramebufferTexture3D" alias="FramebufferTexture3DEXT"> + <function name="FramebufferTexture3D" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> <param name="zoffset" type="GLint"/> + <glx rop="4323"/> </function> - <function name="FramebufferTextureLayer" alias="FramebufferTextureLayerEXT" es2="3.0"> + <function name="FramebufferTextureLayer" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> <param name="layer" type="GLint"/> + <glx rop="237"/> </function> - <function name="FramebufferRenderbuffer" alias="FramebufferRenderbufferEXT" - es2="2.0"> + <function name="FramebufferRenderbuffer" + es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="renderbuffertarget" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> + <glx rop="4324"/> </function> - <function name="GetFramebufferAttachmentParameteriv" - alias="GetFramebufferAttachmentParameterivEXT" es2="2.0"> + <function name="GetFramebufferAttachmentParameteriv" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> + <glx vendorpriv="1428"/> </function> - <function name="BlitFramebuffer" alias="BlitFramebufferEXT" es2="3.0"> + <function name="BlitFramebuffer" es2="3.0" offset="assign"> <param name="srcX0" type="GLint"/> <param name="srcY0" type="GLint"/> <param name="srcX1" type="GLint"/> @@ -273,10 +288,12 @@ <param name="dstY1" type="GLint"/> <param name="mask" type="GLbitfield"/> <param name="filter" type="GLenum"/> + <glx rop="4330"/> </function> - <function name="GenerateMipmap" alias="GenerateMipmapEXT" es2="2.0"> + <function name="GenerateMipmap" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> + <glx rop="4325"/> </function> </category> diff --git a/src/mapi/glapi/gen/ARB_geometry_shader4.xml b/src/mapi/glapi/gen/ARB_geometry_shader4.xml index 73f0a9c3d10..e62047c9bd6 100644 --- a/src/mapi/glapi/gen/ARB_geometry_shader4.xml +++ b/src/mapi/glapi/gen/ARB_geometry_shader4.xml @@ -38,7 +38,7 @@ <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> </function> - <function name="FramebufferTextureLayerARB" alias="FramebufferTextureLayerEXT"> + <function name="FramebufferTextureLayerARB" alias="FramebufferTextureLayer"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> diff --git a/src/mapi/glapi/gen/ARB_instanced_arrays.xml b/src/mapi/glapi/gen/ARB_instanced_arrays.xml index 9a30b0c9e3e..907a9d4b8f3 100644 --- a/src/mapi/glapi/gen/ARB_instanced_arrays.xml +++ b/src/mapi/glapi/gen/ARB_instanced_arrays.xml @@ -10,7 +10,7 @@ <enum name="VERTEX_ATTRIB_ARRAY_DIVISOR_ARB" value="0x88FE"/> - <function name="VertexAttribDivisorARB" offset="assign" mesa_name="-ARB"> + <function name="VertexAttribDivisorARB" alias="VertexAttribDivisor"> <param name="index" type="GLuint"/> <param name="divisor" type="GLuint"/> </function> diff --git a/src/mapi/glapi/gen/ARB_texture_buffer_object.xml b/src/mapi/glapi/gen/ARB_texture_buffer_object.xml index 8884591cad6..ae0d689e545 100644 --- a/src/mapi/glapi/gen/ARB_texture_buffer_object.xml +++ b/src/mapi/glapi/gen/ARB_texture_buffer_object.xml @@ -11,7 +11,7 @@ <enum name="TEXTURE_BUFFER_DATA_STORE_BINDING_ARB" value="0x8C2D"/> <enum name="TEXTURE_BUFFER_FORMAT_ARB" value="0x8C2E"/> - <function name="TexBufferARB" offset="assign" mesa_name="-ARB"> + <function name="TexBufferARB" alias="TexBuffer"> <param name="target" type="GLenum"/> <param name="internalFormat" type="GLenum"/> <param name="buffer" type="GLuint"/> diff --git a/src/mapi/glapi/gen/ARB_vertex_array_object.xml b/src/mapi/glapi/gen/ARB_vertex_array_object.xml index 872548d1aa0..f2277d2bc28 100644 --- a/src/mapi/glapi/gen/ARB_vertex_array_object.xml +++ b/src/mapi/glapi/gen/ARB_vertex_array_object.xml @@ -14,9 +14,9 @@ <param name="array" type="GLuint"/> </function> - <function name="DeleteVertexArrays" alias="DeleteVertexArraysAPPLE" es2="3.0"> + <function name="DeleteVertexArrays" es2="3.0" offset="assign"> <param name="n" type="GLsizei"/> - <param name="arrays" type="const GLuint *"/> + <param name="arrays" type="const GLuint *" count="n"/> </function> <function name="GenVertexArrays" offset="assign" es2="3.0"> @@ -24,7 +24,7 @@ <param name="arrays" type="GLuint *"/> </function> - <function name="IsVertexArray" alias="IsVertexArrayAPPLE" es2="3.0"> + <function name="IsVertexArray" es2="3.0" offset="assign"> <param name="array" type="GLuint"/> <return type="GLboolean"/> </function> diff --git a/src/mapi/glapi/gen/EXT_draw_buffers2.xml b/src/mapi/glapi/gen/EXT_draw_buffers2.xml index affd55a5f5e..7a22651c2ec 100644 --- a/src/mapi/glapi/gen/EXT_draw_buffers2.xml +++ b/src/mapi/glapi/gen/EXT_draw_buffers2.xml @@ -8,7 +8,7 @@ <category name="GL_EXT_draw_buffers2" number="340"> - <function name="ColorMaskIndexedEXT" offset="assign" mesa_name="-EXT"> + <function name="ColorMaskIndexedEXT" alias="ColorMaski"> <param name="buf" type="GLuint"/> <param name="r" type="GLboolean"/> <param name="g" type="GLboolean"/> @@ -16,29 +16,29 @@ <param name="a" type="GLboolean"/> </function> - <function name="GetBooleanIndexedvEXT" offset="assign" mesa_name="-EXT"> + <function name="GetBooleanIndexedvEXT" alias="GetBooleani_v"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLboolean *"/> </function> - <function name="GetIntegerIndexedvEXT" offset="assign" mesa_name="-EXT"> + <function name="GetIntegerIndexedvEXT" alias="GetIntegeri_v"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLint *"/> </function> - <function name="EnableIndexedEXT" offset="assign" mesa_name="-EXT"> + <function name="EnableIndexedEXT" alias="Enablei"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name="DisableIndexedEXT" offset="assign" mesa_name="-EXT"> + <function name="DisableIndexedEXT" alias="Disablei"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name ="IsEnabledIndexedEXT" offset="assign" mesa_name="-EXT"> + <function name ="IsEnabledIndexedEXT" alias="IsEnabledi"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <return type="GLboolean"/> diff --git a/src/mapi/glapi/gen/EXT_framebuffer_object.xml b/src/mapi/glapi/gen/EXT_framebuffer_object.xml index 4f418f7b64c..85a05f6edad 100644 --- a/src/mapi/glapi/gen/EXT_framebuffer_object.xml +++ b/src/mapi/glapi/gen/EXT_framebuffer_object.xml @@ -15,19 +15,19 @@ <enum name="STENCIL_INDEX16_EXT" value="0x8D49"/> <enum name="FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT" count="1" value="0x8CD0"> - <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/> + <size name="GetFramebufferAttachmentParameteriv" mode="get"/> </enum> <enum name="FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT" count="1" value="0x8CD1"> - <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/> + <size name="GetFramebufferAttachmentParameteriv" mode="get"/> </enum> <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT" count="1" value="0x8CD2"> - <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/> + <size name="GetFramebufferAttachmentParameteriv" mode="get"/> </enum> <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT" count="1" value="0x8CD3"> - <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/> + <size name="GetFramebufferAttachmentParameteriv" mode="get"/> </enum> <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT" count="1" value="0x8CD4"> - <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/> + <size name="GetFramebufferAttachmentParameteriv" mode="get"/> </enum> <enum name="COLOR_ATTACHMENT0_EXT" value="0x8CE0"/> @@ -73,122 +73,105 @@ </enum> <enum name="INVALID_FRAMEBUFFER_OPERATION_EXT" value="0x0506"/> - <function name="IsRenderbufferEXT" offset="assign"> + <function name="IsRenderbufferEXT" alias="IsRenderbuffer"> <param name="renderbuffer" type="GLuint"/> <return type="GLboolean"/> - <glx vendorpriv="1422"/> </function> - <function name="BindRenderbufferEXT" offset="assign"> + <function name="BindRenderbufferEXT" alias="BindRenderbuffer"> <param name="target" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> - <glx rop="4316"/> </function> - <function name="DeleteRenderbuffersEXT" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="renderbuffers" type="const GLuint *" count="n"/> - <glx rop="4317"/> + <function name="DeleteRenderbuffersEXT" alias="DeleteRenderbuffers"> + <param name="n" type="GLsizei"/> + <param name="renderbuffers" type="const GLuint *"/> </function> - <function name="GenRenderbuffersEXT" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="renderbuffers" type="GLuint *" count="n" output="true"/> - <glx vendorpriv="1423" always_array="true"/> + <function name="GenRenderbuffersEXT" alias="GenRenderbuffers"> + <param name="n" type="GLsizei"/> + <param name="renderbuffers" type="GLuint *"/> </function> - <function name="RenderbufferStorageEXT" offset="assign"> + <function name="RenderbufferStorageEXT" alias="RenderbufferStorage"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> - <glx rop="4318"/> </function> - <function name="GetRenderbufferParameterivEXT" offset="assign"> + <function name="GetRenderbufferParameterivEXT" alias="GetRenderbufferParameteriv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLint *" output="true"/> - <glx vendorpriv="1424"/> + <param name="params" type="GLint *"/> </function> - <function name="IsFramebufferEXT" offset="assign"> + <function name="IsFramebufferEXT" alias="IsFramebuffer"> <param name="framebuffer" type="GLuint"/> <return type="GLboolean"/> - <glx vendorpriv="1425"/> </function> - <function name="BindFramebufferEXT" offset="assign"> + <function name="BindFramebufferEXT" alias="BindFramebuffer"> <param name="target" type="GLenum"/> <param name="framebuffer" type="GLuint"/> - <glx rop="4319"/> </function> - <function name="DeleteFramebuffersEXT" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="framebuffers" type="const GLuint *" count="n"/> - <glx rop="4320"/> + <function name="DeleteFramebuffersEXT" alias="DeleteFramebuffers"> + <param name="n" type="GLsizei"/> + <param name="framebuffers" type="const GLuint *"/> </function> - <function name="GenFramebuffersEXT" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="framebuffers" type="GLuint *" count="n" output="true"/> - <glx vendorpriv="1426" always_array="true"/> + <function name="GenFramebuffersEXT" alias="GenFramebuffers"> + <param name="n" type="GLsizei"/> + <param name="framebuffers" type="GLuint *"/> </function> - <function name="CheckFramebufferStatusEXT" offset="assign"> + <function name="CheckFramebufferStatusEXT" alias="CheckFramebufferStatus"> <param name="target" type="GLenum"/> <return type="GLenum"/> - <glx vendorpriv="1427"/> </function> - <function name="FramebufferTexture1DEXT" offset="assign"> + <function name="FramebufferTexture1DEXT" alias="FramebufferTexture1D"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> - <glx rop="4321"/> </function> - <function name="FramebufferTexture2DEXT" offset="assign"> + <function name="FramebufferTexture2DEXT" alias="FramebufferTexture2D"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> - <glx rop="4322"/> </function> - <function name="FramebufferTexture3DEXT" offset="assign"> + <function name="FramebufferTexture3DEXT" alias="FramebufferTexture3D"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> <param name="zoffset" type="GLint"/> - <glx rop="4323"/> </function> - <function name="FramebufferRenderbufferEXT" offset="assign"> + <function name="FramebufferRenderbufferEXT" alias="FramebufferRenderbuffer"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="renderbuffertarget" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> - <glx rop="4324"/> </function> - <function name="GetFramebufferAttachmentParameterivEXT" offset="assign"> + <function name="GetFramebufferAttachmentParameterivEXT" alias="GetFramebufferAttachmentParameteriv"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLint *" output="true"/> - <glx vendorpriv="1428"/> + <param name="params" type="GLint *"/> </function> - <function name="GenerateMipmapEXT" offset="assign"> + <function name="GenerateMipmapEXT" alias="GenerateMipmap"> <param name="target" type="GLenum"/> - <glx rop="4325"/> </function> </category> @@ -201,7 +184,7 @@ <enum name="READ_FRAMEBUFFER_BINDING_EXT" count="1" value="0x8CAA"> <size name="Get" mode="get"/> </enum> - <function name="BlitFramebufferEXT" offset="assign" static_dispatch="false"> + <function name="BlitFramebufferEXT" static_dispatch="false" alias="BlitFramebuffer"> <param name="srcX0" type="GLint"/> <param name="srcY0" type="GLint"/> <param name="srcX1" type="GLint"/> @@ -212,7 +195,6 @@ <param name="dstY1" type="GLint"/> <param name="mask" type="GLbitfield"/> <param name="filter" type="GLenum"/> - <glx rop="4330"/> </function> </category> diff --git a/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/src/mapi/glapi/gen/EXT_gpu_shader4.xml index b008f2e655c..d204c3fc7a1 100644 --- a/src/mapi/glapi/gen/EXT_gpu_shader4.xml +++ b/src/mapi/glapi/gen/EXT_gpu_shader4.xml @@ -96,8 +96,7 @@ <param name="w" type="GLuint"/> </function> - <function name="VertexAttribI1ivEXT" offset="assign" exec="loopback" - mesa_name="-EXT"> + <function name="VertexAttribI1ivEXT" alias="VertexAttribI1iv"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> @@ -117,8 +116,7 @@ <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI1uivEXT" offset="assign" exec="loopback" - mesa_name="-EXT"> + <function name="VertexAttribI1uivEXT" alias="VertexAttribI1uiv"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> @@ -138,31 +136,27 @@ <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI4bvEXT" offset="assign" exec="loopback" - mesa_name="-EXT"> + <function name="VertexAttribI4bvEXT" alias="VertexAttribI4bv"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *"/> </function> - <function name="VertexAttribI4svEXT" offset="assign" exec="loopback" - mesa_name="-EXT"> + <function name="VertexAttribI4svEXT" alias="VertexAttribI4sv"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttribI4ubvEXT" offset="assign" exec="loopback" - mesa_name="-EXT"> + <function name="VertexAttribI4ubvEXT" alias="VertexAttribI4ubv"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *"/> </function> - <function name="VertexAttribI4usvEXT" offset="assign" exec="loopback" - mesa_name="-EXT"> + <function name="VertexAttribI4usvEXT" alias="VertexAttribI4usv"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *"/> </function> - <function name="VertexAttribIPointerEXT" offset="assign" mesa_name="-EXT"> + <function name="VertexAttribIPointerEXT" alias="VertexAttribIPointer"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -170,37 +164,37 @@ <param name="pointer" type="const GLvoid *"/> </function> - <function name="GetVertexAttribIivEXT" offset="assign" mesa_name="-EXT"> + <function name="GetVertexAttribIivEXT" alias="GetVertexAttribIiv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetVertexAttribIuivEXT" offset="assign" mesa_name="-EXT"> + <function name="GetVertexAttribIuivEXT" alias="GetVertexAttribIuiv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> </function> - <function name="Uniform1uiEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform1uiEXT" alias="Uniform1ui"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> </function> - <function name="Uniform2uiEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform2uiEXT" alias="Uniform2ui"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> </function> - <function name="Uniform3uiEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform3uiEXT" alias="Uniform3ui"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> <param name="z" type="GLuint"/> </function> - <function name="Uniform4uiEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform4uiEXT" alias="Uniform4ui"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> @@ -208,43 +202,43 @@ <param name="w" type="GLuint"/> </function> - <function name="Uniform1uivEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform1uivEXT" alias="Uniform1uiv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform2uivEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform2uivEXT" alias="Uniform2uiv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform3uivEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform3uivEXT" alias="Uniform3uiv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform4uivEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform4uivEXT" alias="Uniform4uiv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="GetUniformuivEXT" offset="assign" mesa_name="-EXT"> + <function name="GetUniformuivEXT" alias="GetUniformuiv"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> <param name="params" type="GLuint *"/> </function> - <function name="BindFragDataLocationEXT" offset="assign" mesa_name="-EXT"> + <function name="BindFragDataLocationEXT" alias="BindFragDataLocation"> <param name="program" type="GLuint"/> <param name="colorNumber" type="GLuint"/> <param name="name" type="const GLchar *"/> </function> - <function name="GetFragDataLocationEXT" offset="assign" mesa_name="-EXT"> + <function name="GetFragDataLocationEXT" alias="GetFragDataLocation"> <return type="GLint"/> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> diff --git a/src/mapi/glapi/gen/EXT_provoking_vertex.xml b/src/mapi/glapi/gen/EXT_provoking_vertex.xml index 71d2c729091..eb872098d46 100644 --- a/src/mapi/glapi/gen/EXT_provoking_vertex.xml +++ b/src/mapi/glapi/gen/EXT_provoking_vertex.xml @@ -13,7 +13,7 @@ <enum name="PROVOKING_VERTEX_EXT" value="0x8E4F"/> <enum name="QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT" value="0x8E4C"/> - <function name="ProvokingVertexEXT" offset="assign"> + <function name="ProvokingVertexEXT" alias="ProvokingVertex"> <param name="mode" type="GLenum"/> </function> @@ -26,7 +26,7 @@ <enum name="PROVOKING_VERTEX" value="0x8E4F"/> <enum name="QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION" value="0x8E4C"/> - <function name="ProvokingVertex" alias="ProvokingVertexEXT"> + <function name="ProvokingVertex" offset="assign"> <param name="mode" type="GLenum"/> </function> diff --git a/src/mapi/glapi/gen/EXT_texture_array.xml b/src/mapi/glapi/gen/EXT_texture_array.xml index b5b8bd406f7..c68c1fcebde 100644 --- a/src/mapi/glapi/gen/EXT_texture_array.xml +++ b/src/mapi/glapi/gen/EXT_texture_array.xml @@ -26,16 +26,15 @@ </enum> <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT" count="1" value="0x8CD4"> - <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/> + <size name="GetFramebufferAttachmentParameteriv" mode="get"/> </enum> - <function name="FramebufferTextureLayerEXT" offset="assign"> + <function name="FramebufferTextureLayerEXT" alias="FramebufferTextureLayer"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> <param name="layer" type="GLint"/> - <glx rop="237"/> </function> </category> diff --git a/src/mapi/glapi/gen/EXT_texture_integer.xml b/src/mapi/glapi/gen/EXT_texture_integer.xml index dac3999640a..aca21f4b125 100644 --- a/src/mapi/glapi/gen/EXT_texture_integer.xml +++ b/src/mapi/glapi/gen/EXT_texture_integer.xml @@ -69,25 +69,25 @@ <param name="a" type="GLuint"/> </function> - <function name="TexParameterIivEXT" offset="assign" mesa_name="-EXT"> + <function name="TexParameterIivEXT" alias="TexParameterIiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="TexParameterIuivEXT" offset="assign" mesa_name="-EXT"> + <function name="TexParameterIuivEXT" alias="TexParameterIuiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLuint *"/> </function> - <function name="GetTexParameterIivEXT" offset="assign" mesa_name="-EXT"> + <function name="GetTexParameterIivEXT" alias="GetTexParameterIiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetTexParameterIuivEXT" offset="assign" mesa_name="-EXT"> + <function name="GetTexParameterIuivEXT" alias="GetTexParameterIuiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> diff --git a/src/mapi/glapi/gen/EXT_transform_feedback.xml b/src/mapi/glapi/gen/EXT_transform_feedback.xml index e9b27582a22..e4b310ec362 100644 --- a/src/mapi/glapi/gen/EXT_transform_feedback.xml +++ b/src/mapi/glapi/gen/EXT_transform_feedback.xml @@ -24,7 +24,7 @@ <enum name="TRANSFORM_FEEDBACK_BUFFER_MODE_EXT" value="0x8C7F"/> <enum name="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT" value="0x8C76"/> - <function name="BindBufferRangeEXT" offset="assign" mesa_name="-EXT"> + <function name="BindBufferRangeEXT" alias="BindBufferRange"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> @@ -39,29 +39,27 @@ <param name="offset" type="GLintptr"/> </function> - <function name="BindBufferBaseEXT" offset="assign" mesa_name="-EXT"> + <function name="BindBufferBaseEXT" alias="BindBufferBase"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> </function> - <function name="BeginTransformFeedbackEXT" offset="assign" mesa_name="-EXT"> + <function name="BeginTransformFeedbackEXT" alias="BeginTransformFeedback"> <param name="mode" type="GLenum"/> </function> - <function name="EndTransformFeedbackEXT" offset="assign" mesa_name="-EXT"> + <function name="EndTransformFeedbackEXT" alias="EndTransformFeedback"> </function> - <function name="TransformFeedbackVaryingsEXT" offset="assign" - mesa_name="-EXT"> + <function name="TransformFeedbackVaryingsEXT" alias="TransformFeedbackVaryings"> <param name="program" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="varyings" type="const char **"/> <param name="bufferMode" type="GLenum"/> </function> - <function name="GetTransformFeedbackVaryingEXT" offset="assign" - mesa_name="-EXT"> + <function name="GetTransformFeedbackVaryingEXT" alias="GetTransformFeedbackVarying"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml index ad12102c613..83b5d499a12 100644 --- a/src/mapi/glapi/gen/GL3x.xml +++ b/src/mapi/glapi/gen/GL3x.xml @@ -150,14 +150,15 @@ <return type="const GLubyte *"/> </function> - <function name="ClampColor" alias="ClampColorARB"> + <function name="ClampColor" offset="assign"> <param name="target" type="GLenum"/> <param name="clamp" type="GLenum"/> + <glx rop="234"/> </function> <!-- These functions alias ones form GL_ARB_draw_buffers2 --> - <function name="ColorMaski" alias="ColorMaskIndexedEXT"> + <function name="ColorMaski" offset="assign"> <param name="buf" type="GLuint"/> <param name="r" type="GLboolean"/> <param name="g" type="GLboolean"/> @@ -165,29 +166,29 @@ <param name="a" type="GLboolean"/> </function> - <function name="GetBooleani_v" alias="GetBooleanIndexedvEXT"> + <function name="GetBooleani_v" offset="assign"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLboolean *"/> </function> - <function name="GetIntegeri_v" alias="GetIntegerIndexedvEXT" es2="3.0"> + <function name="GetIntegeri_v" es2="3.0" offset="assign"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLint *"/> </function> - <function name="Enablei" alias="EnableIndexedEXT"> + <function name="Enablei" offset="assign"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name="Disablei" alias="DisableIndexedEXT"> + <function name="Disablei" offset="assign"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name="IsEnabledi" alias="IsEnabledIndexedEXT"> + <function name="IsEnabledi" offset="assign"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <return type="GLboolean"/> @@ -195,26 +196,26 @@ <!-- These functions alias ones form GL_EXT_transform_feedback --> - <function name="GetFragDataLocation" alias="GetFragDataLocationEXT" es2="3.0"> + <function name="GetFragDataLocation" es2="3.0" offset="assign"> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> <return type="GLint"/> </function> - <function name="BindFragDataLocation" alias="BindFragDataLocationEXT"> + <function name="BindFragDataLocation" offset="assign"> <param name="program" type="GLuint"/> <param name="colorNumber" type="GLuint"/> <param name="name" type="const GLchar *"/> </function> - <function name="BeginTransformFeedback" alias="BeginTransformFeedbackEXT" es2="3.0"> + <function name="BeginTransformFeedback" es2="3.0" offset="assign"> <param name="mode" type="GLenum"/> </function> - <function name="EndTransformFeedback" alias="EndTransformFeedbackEXT" es2="3.0"> + <function name="EndTransformFeedback" es2="3.0" offset="assign"> </function> - <function name="BindBufferRange" alias="BindBufferRangeEXT" es2="3.0"> + <function name="BindBufferRange" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> @@ -222,20 +223,20 @@ <param name="size" type="GLsizeiptr"/> </function> - <function name="BindBufferBase" alias="BindBufferBaseEXT" es2="3.0"> + <function name="BindBufferBase" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> </function> - <function name="TransformFeedbackVaryings" alias="TransformFeedbackVaryingsEXT" es2="3.0"> + <function name="TransformFeedbackVaryings" es2="3.0" offset="assign"> <param name="program" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="varyings" type="const GLchar * const *"/> <param name="bufferMode" type="GLenum"/> </function> - <function name="GetTransformFeedbackVarying" alias="GetTransformFeedbackVaryingEXT" es2="3.0"> + <function name="GetTransformFeedbackVarying" es2="3.0" offset="assign"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> @@ -247,17 +248,17 @@ <!-- These functions alias ones from GL_NV_conditional_render --> - <function name="BeginConditionalRender" alias="BeginConditionalRenderNV"> + <function name="BeginConditionalRender" offset="assign"> <param name="query" type="GLuint"/> <param name="mode" type="GLenum"/> </function> - <function name="EndConditionalRender" alias="EndConditionalRenderNV"> + <function name="EndConditionalRender" offset="assign"> </function> <!-- These functions alias ones from GL_EXT_gpu_shader4 --> - <function name="VertexAttribIPointer" alias="VertexAttribIPointerEXT" es2="3.0"> + <function name="VertexAttribIPointer" es2="3.0" offset="assign"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -265,13 +266,13 @@ <param name="pointer" type="const GLvoid *"/> </function> - <function name="GetVertexAttribIiv" alias="GetVertexAttribIivEXT" es2="3.0"> + <function name="GetVertexAttribIiv" es2="3.0" offset="assign"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetVertexAttribIuiv" alias="GetVertexAttribIuivEXT" es2="3.0"> + <function name="GetVertexAttribIuiv" es2="3.0" offset="assign"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> @@ -329,7 +330,7 @@ <param name="w" type="GLuint"/> </function> - <function name="VertexAttribI1iv" alias="VertexAttribI1ivEXT"> + <function name="VertexAttribI1iv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> @@ -349,7 +350,7 @@ <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI1uiv" alias="VertexAttribI1uivEXT"> + <function name="VertexAttribI1uiv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> @@ -369,51 +370,51 @@ <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI4bv" alias="VertexAttribI4bvEXT"> + <function name="VertexAttribI4bv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *"/> </function> - <function name="VertexAttribI4sv" alias="VertexAttribI4svEXT"> + <function name="VertexAttribI4sv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttribI4ubv" alias="VertexAttribI4ubvEXT"> + <function name="VertexAttribI4ubv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *"/> </function> - <function name="VertexAttribI4usv" alias="VertexAttribI4usvEXT"> + <function name="VertexAttribI4usv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *"/> </function> - <function name="GetUniformuiv" alias="GetUniformuivEXT" es2="3.0"> + <function name="GetUniformuiv" es2="3.0" offset="assign"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> <param name="params" type="GLuint *"/> </function> - <function name="Uniform1ui" alias="Uniform1uiEXT" es2="3.0"> + <function name="Uniform1ui" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> </function> - <function name="Uniform2ui" alias="Uniform2uiEXT" es2="3.0"> + <function name="Uniform2ui" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> </function> - <function name="Uniform3ui" alias="Uniform3uiEXT" es2="3.0"> + <function name="Uniform3ui" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> <param name="z" type="GLuint"/> </function> - <function name="Uniform4ui" alias="Uniform4uiEXT" es2="3.0"> + <function name="Uniform4ui" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> @@ -421,25 +422,25 @@ <param name="w" type="GLuint"/> </function> - <function name="Uniform1uiv" alias="Uniform1uivEXT" es2="3.0"> + <function name="Uniform1uiv" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform2uiv" alias="Uniform2uivEXT" es2="3.0"> + <function name="Uniform2uiv" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform3uiv" alias="Uniform3uivEXT" es2="3.0"> + <function name="Uniform3uiv" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform4uiv" alias="Uniform4uivEXT" es2="3.0"> + <function name="Uniform4uiv" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> @@ -447,25 +448,25 @@ <!-- These functions alias ones from GL_EXT_texture_integer --> - <function name="TexParameterIiv" alias="TexParameterIivEXT"> + <function name="TexParameterIiv" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="TexParameterIuiv" alias="TexParameterIuivEXT"> + <function name="TexParameterIuiv" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLuint *"/> </function> - <function name="GetTexParameterIiv" alias="GetTexParameterIivEXT"> + <function name="GetTexParameterIiv" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetTexParameterIuiv" alias="GetTexParameterIuivEXT"> + <function name="GetTexParameterIuiv" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> @@ -556,13 +557,13 @@ <param name="primcount" type="GLsizei"/> </function> - <function name="TexBuffer" offset="assign" alias="TexBufferARB"> + <function name="TexBuffer" offset="assign"> <param name="target" type="GLenum"/> <param name="internalFormat" type="GLenum"/> <param name="buffer" type="GLuint"/> </function> - <function name="PrimitiveRestartIndex" alias="PrimitiveRestartIndexNV"> + <function name="PrimitiveRestartIndex" offset="assign"> <param name="index" type="GLuint"/> </function> @@ -625,8 +626,7 @@ <enum name="TEXTURE_SWIZZLE_A" value="0x8E45"/> <enum name="TEXTURE_SWIZZLE_RGBA" value="0x8E46"/> - <function name="VertexAttribDivisor" offset="assign" es2="3.0" - alias="VertexAttribDivisorARB"> + <function name="VertexAttribDivisor" offset="assign" es2="3.0"> <param name="index" type="GLuint"/> <param name="divisor" type="GLuint"/> </function> diff --git a/src/mapi/glapi/gen/NV_conditional_render.xml b/src/mapi/glapi/gen/NV_conditional_render.xml index 8bb5c22cad2..926b2629412 100644 --- a/src/mapi/glapi/gen/NV_conditional_render.xml +++ b/src/mapi/glapi/gen/NV_conditional_render.xml @@ -13,12 +13,12 @@ <enum name="QUERY_BY_REGION_WAIT_NV" value="0x8E15"/> <enum name="QUERY_BY_REGION_NO_WAIT_NV" value="0x8E16"/> - <function name="BeginConditionalRenderNV" offset="assign" mesa_name="-NV"> + <function name="BeginConditionalRenderNV" alias="BeginConditionalRender"> <param name="query" type="GLuint"/> <param name="mode" type="GLenum"/> </function> - <function name="EndConditionalRenderNV" offset="assign" mesa_name="-NV"> + <function name="EndConditionalRenderNV" alias="EndConditionalRender"> </function> </category> diff --git a/src/mapi/glapi/gen/NV_primitive_restart.xml b/src/mapi/glapi/gen/NV_primitive_restart.xml index d19fc8cf1b5..39edafe31c6 100644 --- a/src/mapi/glapi/gen/NV_primitive_restart.xml +++ b/src/mapi/glapi/gen/NV_primitive_restart.xml @@ -15,7 +15,7 @@ exec="dynamic"> </function> - <function name="PrimitiveRestartIndexNV" offset="assign" mesa_name="-NV"> + <function name="PrimitiveRestartIndexNV" alias="PrimitiveRestartIndex"> <param name="index" type="GLuint"/> </function> diff --git a/src/mapi/glapi/gen/OES_fixed_point.xml b/src/mapi/glapi/gen/OES_fixed_point.xml index ad775728ff7..d62d6e2ec51 100644 --- a/src/mapi/glapi/gen/OES_fixed_point.xml +++ b/src/mapi/glapi/gen/OES_fixed_point.xml @@ -13,53 +13,52 @@ <type name="clampx" size="4" /> <!-- OpenGL ES 1.0 --> - <function name="AlphaFuncxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="AlphaFuncxOES" static_dispatch="false" + es1="1.0" alias="AlphaFuncx"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampx"/> </function> - <function name="ClearColorxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="ClearColorxOES" static_dispatch="false" + es1="1.0" alias="ClearColorx"> <param name="red" type="GLclampx"/> <param name="green" type="GLclampx"/> <param name="blue" type="GLclampx"/> <param name="alpha" type="GLclampx"/> </function> - <function name="ClearDepthxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="ClearDepthxOES" static_dispatch="false" + es1="1.0" alias="ClearDepthx"> <param name="depth" type="GLclampx"/> </function> - <function name="Color4xOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="Color4xOES" static_dispatch="false" + es1="1.0" alias="Color4x"> <param name="red" type="GLfixed"/> <param name="green" type="GLfixed"/> <param name="blue" type="GLfixed"/> <param name="alpha" type="GLfixed"/> </function> - <function name="DepthRangexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="DepthRangexOES" static_dispatch="false" + es1="1.0" alias="DepthRangex"> <param name="zNear" type="GLclampx"/> <param name="zFar" type="GLclampx"/> </function> - <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0" - exec="es" mesa_name="-OES"> + <function name="FogxOES" static_dispatch="false" es1="1.0" alias="Fogx"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="FogxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="FogxvOES" static_dispatch="false" + es1="1.0" alias="Fogxv"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfixed *" variable_param="pname"/> + <param name="params" type="const GLfixed *"/> </function> - <function name="FrustumxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="FrustumxOES" static_dispatch="false" + es1="1.0" alias="Frustumx"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -68,63 +67,63 @@ <param name="zFar" type="GLfixed"/> </function> - <function name="LightModelxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="LightModelxOES" static_dispatch="false" + es1="1.0" alias="LightModelx"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="LightModelxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="LightModelxvOES" static_dispatch="false" + es1="1.0" alias="LightModelxv"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfixed *" variable_param="pname"/> + <param name="params" type="const GLfixed *"/> </function> - <function name="LightxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="LightxOES" static_dispatch="false" + es1="1.0" alias="Lightx"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="LightxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="LightxvOES" static_dispatch="false" + es1="1.0" alias="Lightxv"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfixed *" variable_param="pname"/> + <param name="params" type="const GLfixed *"/> </function> - <function name="LineWidthxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="LineWidthxOES" static_dispatch="false" + es1="1.0" alias="LineWidthx"> <param name="width" type="GLfixed"/> </function> - <function name="LoadMatrixxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> - <param name="m" type="const GLfixed *" count="16"/> + <function name="LoadMatrixxOES" static_dispatch="false" + es1="1.0" alias="LoadMatrixx"> + <param name="m" type="const GLfixed *"/> </function> - <function name="MaterialxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="MaterialxOES" static_dispatch="false" + es1="1.0" alias="Materialx"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="MaterialxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="MaterialxvOES" static_dispatch="false" + es1="1.0" alias="Materialxv"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfixed *" variable_param="pname"/> + <param name="params" type="const GLfixed *"/> </function> - <function name="MultMatrixxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> - <param name="m" type="const GLfixed *" count="16"/> + <function name="MultMatrixxOES" static_dispatch="false" + es1="1.0" alias="MultMatrixx"> + <param name="m" type="const GLfixed *"/> </function> - <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="MultiTexCoord4xOES" static_dispatch="false" + es1="1.0" alias="MultiTexCoord4x"> <param name="target" type="GLenum"/> <param name="s" type="GLfixed"/> <param name="t" type="GLfixed"/> @@ -132,15 +131,15 @@ <param name="q" type="GLfixed"/> </function> - <function name="Normal3xOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="Normal3xOES" static_dispatch="false" + es1="1.0" alias="Normal3x"> <param name="nx" type="GLfixed"/> <param name="ny" type="GLfixed"/> <param name="nz" type="GLfixed"/> </function> - <function name="OrthoxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="OrthoxOES" static_dispatch="false" + es1="1.0" alias="Orthox"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -149,149 +148,149 @@ <param name="zFar" type="GLfixed"/> </function> - <function name="PointSizexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="PointSizexOES" static_dispatch="false" + es1="1.0" alias="PointSizex"> <param name="size" type="GLfixed"/> </function> - <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="PolygonOffsetxOES" static_dispatch="false" + es1="1.0" alias="PolygonOffsetx"> <param name="factor" type="GLfixed"/> <param name="units" type="GLfixed"/> </function> - <function name="RotatexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="RotatexOES" static_dispatch="false" + es1="1.0" alias="Rotatex"> <param name="angle" type="GLfixed"/> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> - <function name="SampleCoveragexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="SampleCoveragexOES" static_dispatch="false" + es1="1.0" alias="SampleCoveragex"> <param name="value" type="GLclampx"/> <param name="invert" type="GLboolean"/> </function> - <function name="ScalexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="ScalexOES" static_dispatch="false" + es1="1.0" alias="Scalex"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> - <function name="TexEnvxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="TexEnvxOES" static_dispatch="false" + es1="1.0" alias="TexEnvx"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="TexEnvxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="TexEnvxvOES" static_dispatch="false" + es1="1.0" alias="TexEnvxv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfixed *" variable_param="pname"/> + <param name="params" type="const GLfixed *"/> </function> - <function name="TexParameterxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="TexParameterxOES" static_dispatch="false" + es1="1.0" alias="TexParameterx"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="TranslatexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="TranslatexOES" static_dispatch="false" + es1="1.0" alias="Translatex"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> <!-- OpenGL ES 1.1 --> - <function name="ClipPlanexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="ClipPlanexOES" static_dispatch="false" + es1="1.0" alias="ClipPlanex"> <param name="plane" type="GLenum"/> - <param name="equation" type="const GLfixed *" count="4"/> + <param name="equation" type="const GLfixed *"/> </function> - <function name="GetClipPlanexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" desktop="false" mesa_name="-OES"> + <function name="GetClipPlanexOES" static_dispatch="false" + es1="1.0" desktop="false" alias="GetClipPlanex"> <param name="plane" type="GLenum"/> - <param name="equation" type="GLfixed *" output="true" count="4"/> + <param name="equation" type="GLfixed *"/> </function> - <function name="GetFixedvOES" offset="assign" static_dispatch="false" - es1="1.0" mesa_name="-OES"> + <function name="GetFixedvOES" static_dispatch="false" + es1="1.0" alias="GetFixedv"> <param name="pname" type="GLenum"/> - <param name="params" type="GLfixed *" output="true" variable_param="pname"/> + <param name="params" type="GLfixed *"/> </function> - <function name="GetLightxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="GetLightxvOES" static_dispatch="false" + es1="1.0" alias="GetLightxv"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLfixed *" output="true" variable_param="pname"/> + <param name="params" type="GLfixed *"/> </function> - <function name="GetMaterialxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="GetMaterialxvOES" static_dispatch="false" + es1="1.0" alias="GetMaterialxv"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLfixed *" output="true" variable_param="pname"/> + <param name="params" type="GLfixed *"/> </function> - <function name="GetTexEnvxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="GetTexEnvxvOES" static_dispatch="false" + es1="1.0" alias="GetTexEnvxv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLfixed *" output="true" variable_param="pname"/> + <param name="params" type="GLfixed *"/> </function> - <function name="GetTexParameterxvOES" offset="assign" - static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES"> + <function name="GetTexParameterxvOES" + static_dispatch="false" es1="1.0" alias="GetTexParameterxv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLfixed *" output="true" variable_param="pname"/> + <param name="params" type="GLfixed *"/> </function> - <function name="PointParameterxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="PointParameterxOES" static_dispatch="false" + es1="1.0" alias="PointParameterx"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="PointParameterxvOES" offset="assign" - static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES"> + <function name="PointParameterxvOES" + static_dispatch="false" es1="1.0" alias="PointParameterxv"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *"/> </function> - <function name="TexParameterxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="TexParameterxvOES" static_dispatch="false" + es1="1.0" alias="TexParameterxv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfixed *" variable_param="pname"/> + <param name="params" type="const GLfixed *"/> </function> <!-- texgen --> <function name="GetTexGenxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="check" desktop="false"> + es1="1.0" desktop="false"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="TexGenxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="check" desktop="false"> + es1="1.0" desktop="false"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> <function name="TexGenxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="check" desktop="false"> + es1="1.0" desktop="false"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> diff --git a/src/mapi/glapi/gen/OES_single_precision.xml b/src/mapi/glapi/gen/OES_single_precision.xml index 8a6c2719451..8346b64ee83 100644 --- a/src/mapi/glapi/gen/OES_single_precision.xml +++ b/src/mapi/glapi/gen/OES_single_precision.xml @@ -11,10 +11,10 @@ <param name="depth" type="GLclampf"/> </function> - <function name="ClipPlanefOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="ClipPlanefOES" static_dispatch="false" + es1="1.0" alias="ClipPlanef"> <param name="plane" type="GLenum"/> - <param name="equation" type="const GLfloat *" count="4"/> + <param name="equation" type="const GLfloat *"/> </function> <function name="DepthRangefOES" alias="DepthRangef" static_dispatch="false" @@ -23,14 +23,14 @@ <param name="zFar" type="GLclampf"/> </function> - <function name="GetClipPlanefOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" desktop="false" mesa_name="-OES"> + <function name="GetClipPlanefOES" static_dispatch="false" + es1="1.0" desktop="false" alias="GetClipPlanef"> <param name="plane" type="GLenum"/> - <param name="equation" type="GLfloat *" output="true" count="4"/> + <param name="equation" type="GLfloat *"/> </function> - <function name="FrustumfOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="FrustumfOES" static_dispatch="false" + es1="1.0" alias="Frustumf"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -39,8 +39,8 @@ <param name="zFar" type="GLfloat"/> </function> - <function name="OrthofOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="OrthofOES" static_dispatch="false" + es1="1.0" alias="Orthof"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml index c0bbbfae1be..0f6746d2a30 100644 --- a/src/mapi/glapi/gen/es_EXT.xml +++ b/src/mapi/glapi/gen/es_EXT.xml @@ -10,7 +10,7 @@ <enum name="BLEND_EQUATION_RGB_OES" value="0x8009"/> <enum name="BLEND_EQUATION_ALPHA_OES" value="0x883D"/> - <function name="BlendEquationSeparateOES" alias="BlendEquationSeparateEXT" + <function name="BlendEquationSeparateOES" alias="BlendEquationSeparate" static_dispatch="false" es1="1.0"> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> @@ -24,7 +24,7 @@ <enum name="BLEND_DST_ALPHA_OES" value="0x80CA"/> <enum name="BLEND_SRC_ALPHA_OES" value="0x80CB"/> - <function name="BlendFuncSeparateOES" alias="BlendFuncSeparateEXT" + <function name="BlendFuncSeparateOES" alias="BlendFuncSeparate" static_dispatch="false" es1="1.0"> <param name="sfactorRGB" type="GLenum"/> <param name="dfactorRGB" type="GLenum"/> @@ -73,7 +73,7 @@ <enum name="TEXTURE_CROP_RECT_OES" value="0x8B9D"/> <function name="DrawTexiOES" offset="assign" static_dispatch="false" - es1="1.0" desktop="false" mesa_name="-OES"> + es1="1.0" desktop="false"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> @@ -82,12 +82,12 @@ </function> <function name="DrawTexivOES" offset="assign" static_dispatch="false" - es1="1.0" desktop="false" mesa_name="-OES"> + es1="1.0" desktop="false"> <param name="coords" type="const GLint *" count="5"/> </function> <function name="DrawTexfOES" offset="assign" static_dispatch="false" - es1="1.0" desktop="false" mesa_name="-OES"> + es1="1.0" desktop="false"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> @@ -96,12 +96,12 @@ </function> <function name="DrawTexfvOES" offset="assign" static_dispatch="false" - es1="1.0" desktop="false" mesa_name="-OES"> + es1="1.0" desktop="false"> <param name="coords" type="const GLfloat *" count="5"/> </function> <function name="DrawTexsOES" offset="assign" static_dispatch="false" - es1="1.0" desktop="false" mesa_name="-OES"> + es1="1.0" desktop="false"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> @@ -110,12 +110,12 @@ </function> <function name="DrawTexsvOES" offset="assign" static_dispatch="false" - es1="1.0" desktop="false" mesa_name="-OES"> + es1="1.0" desktop="false"> <param name="coords" type="const GLshort *" count="5"/> </function> <function name="DrawTexxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" desktop="false"> + es1="1.0" desktop="false"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> @@ -124,7 +124,7 @@ </function> <function name="DrawTexxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" desktop="false"> + es1="1.0" desktop="false"> <param name="coords" type="const GLfixed *" count="5"/> </function> @@ -177,39 +177,39 @@ <enum name="RENDERBUFFER_STENCIL_SIZE_OES" value="0x8D55"/> <enum name="RGB565_OES" value="0x8D62"/> - <function name="BindFramebufferOES" alias="BindFramebufferEXT" + <function name="BindFramebufferOES" alias="BindFramebuffer" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="framebuffer" type="GLuint"/> </function> - <function name="BindRenderbufferOES" alias="BindRenderbufferEXT" + <function name="BindRenderbufferOES" alias="BindRenderbuffer" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> </function> <function name="CheckFramebufferStatusOES" - alias="CheckFramebufferStatusEXT" static_dispatch="false" + alias="CheckFramebufferStatus" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <return type="GLenum"/> </function> - <function name="DeleteFramebuffersOES" alias="DeleteFramebuffersEXT" + <function name="DeleteFramebuffersOES" alias="DeleteFramebuffers" static_dispatch="false" es1="1.0"> <param name="n" type="GLsizei" counter="true"/> <param name="framebuffers" type="const GLuint *" count="n"/> </function> - <function name="DeleteRenderbuffersOES" alias="DeleteRenderbuffersEXT" + <function name="DeleteRenderbuffersOES" alias="DeleteRenderbuffers" static_dispatch="false" es1="1.0"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="const GLuint *" count="n"/> </function> <function name="FramebufferRenderbufferOES" - alias="FramebufferRenderbufferEXT" static_dispatch="false" + alias="FramebufferRenderbuffer" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> @@ -217,7 +217,7 @@ <param name="renderbuffer" type="GLuint"/> </function> - <function name="FramebufferTexture2DOES" alias="FramebufferTexture2DEXT" + <function name="FramebufferTexture2DOES" alias="FramebufferTexture2D" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> @@ -226,25 +226,25 @@ <param name="level" type="GLint"/> </function> - <function name="GenerateMipmapOES" alias="GenerateMipmapEXT" + <function name="GenerateMipmapOES" alias="GenerateMipmap" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> </function> - <function name="GenFramebuffersOES" alias="GenFramebuffersEXT" + <function name="GenFramebuffersOES" alias="GenFramebuffers" static_dispatch="false" es1="1.0"> <param name="n" type="GLsizei" counter="true"/> <param name="framebuffers" type="GLuint *" count="n" output="true"/> </function> - <function name="GenRenderbuffersOES" alias="GenRenderbuffersEXT" + <function name="GenRenderbuffersOES" alias="GenRenderbuffers" static_dispatch="false" es1="1.0"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="GLuint *" count="n" output="true"/> </function> <function name="GetFramebufferAttachmentParameterivOES" - alias="GetFramebufferAttachmentParameterivEXT" + alias="GetFramebufferAttachmentParameteriv" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> @@ -253,26 +253,26 @@ </function> <function name="GetRenderbufferParameterivOES" - alias="GetRenderbufferParameterivEXT" static_dispatch="false" + alias="GetRenderbufferParameteriv" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> </function> - <function name="IsFramebufferOES" alias="IsFramebufferEXT" + <function name="IsFramebufferOES" alias="IsFramebuffer" static_dispatch="false" es1="1.0"> <param name="framebuffer" type="GLuint"/> <return type="GLboolean"/> </function> - <function name="IsRenderbufferOES" alias="IsRenderbufferEXT" + <function name="IsRenderbufferOES" alias="IsRenderbuffer" static_dispatch="false" es1="1.0"> <param name="renderbuffer" type="GLuint"/> <return type="GLboolean"/> </function> - <function name="RenderbufferStorageOES" alias="RenderbufferStorageEXT" + <function name="RenderbufferStorageOES" alias="RenderbufferStorage" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> @@ -343,8 +343,7 @@ <enum name="POINT_SIZE_ARRAY_BUFFER_BINDING_OES" value="0x8B9F"/> <function name="PointSizePointerOES" offset="assign" - static_dispatch="false" es1="1.0" desktop="false" - mesa_name="-OES"> + static_dispatch="false" es1="1.0" desktop="false"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -360,7 +359,7 @@ <!-- optional for es1.0 --> <category name="GL_OES_query_matrix" number="16"> <function name="QueryMatrixxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" desktop="false"> + es1="1.0" desktop="false"> <param name="mantissa" type="GLfixed *" count="16" /> <param name="exponent" type="GLint *" count="16" /> <return type="GLbitfield"/> @@ -460,21 +459,21 @@ <enum name="BUFFER_MAPPED_OES" value="0x88BC"/> <enum name="BUFFER_MAP_POINTER_OES" value="0x88BD"/> - <function name="GetBufferPointervOES" alias="GetBufferPointervARB" + <function name="GetBufferPointervOES" alias="GetBufferPointerv" static_dispatch="false" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLvoid **"/> </function> - <function name="MapBufferOES" alias="MapBufferARB" static_dispatch="false" + <function name="MapBufferOES" alias="MapBuffer" static_dispatch="false" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="access" type="GLenum"/> <return type="GLvoid *"/> </function> - <function name="UnmapBufferOES" alias="UnmapBufferARB" + <function name="UnmapBufferOES" alias="UnmapBuffer" static_dispatch="false" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <return type="GLboolean"/> @@ -506,7 +505,7 @@ <enum name="SAMPLER_3D_OES" value="0x8B5F"/> <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES" value="0x8CD4"/> - <function name="CompressedTexImage3DOES" alias="CompressedTexImage3DARB" + <function name="CompressedTexImage3DOES" alias="CompressedTexImage3D" static_dispatch="false" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> @@ -520,7 +519,7 @@ </function> <function name="CompressedTexSubImage3DOES" - alias="CompressedTexSubImage3DARB" static_dispatch="false" + alias="CompressedTexSubImage3D" static_dispatch="false" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> @@ -548,7 +547,7 @@ <param name="height" type="GLsizei"/> </function> - <function name="FramebufferTexture3DOES" alias="FramebufferTexture3DEXT" + <function name="FramebufferTexture3DOES" alias="FramebufferTexture3D" static_dispatch="false" es2="2.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> @@ -680,7 +679,7 @@ <param name="array" type="GLuint"/> </function> - <function name="DeleteVertexArraysOES" alias="DeleteVertexArraysAPPLE" + <function name="DeleteVertexArraysOES" alias="DeleteVertexArrays" es2="2.0"> <param name="n" type="GLsizei"/> <param name="arrays" type="const GLuint *" count="n"/> @@ -691,7 +690,7 @@ <param name="arrays" type="GLuint *" output="true" count="n"/> </function> - <function name="IsVertexArrayOES" alias="IsVertexArrayAPPLE" es2="2.0"> + <function name="IsVertexArrayOES" alias="IsVertexArray" es2="2.0"> <param name="array" type="GLuint"/> <return type="GLboolean"/> </function> @@ -766,7 +765,7 @@ <size name="Get" mode="get"/> </enum> - <function name="DrawBuffersNV" alias="DrawBuffersARB" es2="2.0"> + <function name="DrawBuffersNV" alias="DrawBuffers" es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="bufs" type="const GLenum *" count="n"/> </function> diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 9645fdb814a..a47316a8351 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -1164,27 +1164,25 @@ </function> <function name="Color3b" offset="9" vectorequiv="Color3bv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="Color3bv" offset="10" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3bv" offset="10" deprecated="3.1"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="6"/> </function> <function name="Color3d" offset="11" vectorequiv="Color3dv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="Color3dv" offset="12" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3dv" offset="12" deprecated="3.1"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="7"/> </function> @@ -1202,94 +1200,87 @@ </function> <function name="Color3i" offset="15" vectorequiv="Color3iv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="Color3iv" offset="16" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3iv" offset="16" deprecated="3.1"> <param name="v" type="const GLint *" count="3"/> <glx rop="9"/> </function> <function name="Color3s" offset="17" vectorequiv="Color3sv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="Color3sv" offset="18" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3sv" offset="18" deprecated="3.1"> <param name="v" type="const GLshort *" count="3"/> <glx rop="10"/> </function> <function name="Color3ub" offset="19" vectorequiv="Color3ubv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="Color3ubv" offset="20" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3ubv" offset="20" deprecated="3.1"> <param name="v" type="const GLubyte *" count="3"/> <glx rop="11"/> </function> <function name="Color3ui" offset="21" vectorequiv="Color3uiv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="Color3uiv" offset="22" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3uiv" offset="22" deprecated="3.1"> <param name="v" type="const GLuint *" count="3"/> <glx rop="12"/> </function> <function name="Color3us" offset="23" vectorequiv="Color3usv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="Color3usv" offset="24" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3usv" offset="24" deprecated="3.1"> <param name="v" type="const GLushort *" count="3"/> <glx rop="13"/> </function> <function name="Color4b" offset="25" vectorequiv="Color4bv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> <param name="alpha" type="GLbyte"/> </function> - <function name="Color4bv" offset="26" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4bv" offset="26" deprecated="3.1"> <param name="v" type="const GLbyte *" count="4"/> <glx rop="14"/> </function> <function name="Color4d" offset="27" vectorequiv="Color4dv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> <param name="alpha" type="GLdouble"/> </function> - <function name="Color4dv" offset="28" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4dv" offset="28" deprecated="3.1"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="15"/> </function> @@ -1308,71 +1299,66 @@ </function> <function name="Color4i" offset="31" vectorequiv="Color4iv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> <param name="alpha" type="GLint"/> </function> - <function name="Color4iv" offset="32" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4iv" offset="32" deprecated="3.1"> <param name="v" type="const GLint *" count="4"/> <glx rop="17"/> </function> <function name="Color4s" offset="33" vectorequiv="Color4sv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> <param name="alpha" type="GLshort"/> </function> - <function name="Color4sv" offset="34" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4sv" offset="34" deprecated="3.1"> <param name="v" type="const GLshort *" count="4"/> <glx rop="18"/> </function> <function name="Color4ub" offset="35" vectorequiv="Color4ubv" es1="1.1" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> <param name="alpha" type="GLubyte"/> </function> - <function name="Color4ubv" offset="36" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4ubv" offset="36" deprecated="3.1"> <param name="v" type="const GLubyte *" count="4"/> <glx rop="19"/> </function> <function name="Color4ui" offset="37" vectorequiv="Color4uiv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> <param name="alpha" type="GLuint"/> </function> - <function name="Color4uiv" offset="38" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4uiv" offset="38" deprecated="3.1"> <param name="v" type="const GLuint *" count="4"/> <glx rop="20"/> </function> <function name="Color4us" offset="39" vectorequiv="Color4usv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> <param name="alpha" type="GLushort"/> </function> - <function name="Color4usv" offset="40" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4usv" offset="40" deprecated="3.1"> <param name="v" type="const GLushort *" count="4"/> <glx rop="21"/> </function> @@ -1382,7 +1368,7 @@ <param name="flag" type="GLboolean"/> </function> - <function name="EdgeFlagv" offset="42" deprecated="3.1" exec="loopback"> + <function name="EdgeFlagv" offset="42" deprecated="3.1"> <param name="flag" type="const GLboolean *" count="1"/> <glx rop="22"/> </function> @@ -1391,12 +1377,11 @@ <glx rop="23"/> </function> - <function name="Indexd" offset="44" vectorequiv="Indexdv" deprecated="3.1" - exec="loopback"> + <function name="Indexd" offset="44" vectorequiv="Indexdv" deprecated="3.1"> <param name="c" type="GLdouble"/> </function> - <function name="Indexdv" offset="45" deprecated="3.1" exec="loopback"> + <function name="Indexdv" offset="45" deprecated="3.1"> <param name="c" type="const GLdouble *" count="1"/> <glx rop="24"/> </function> @@ -1411,46 +1396,44 @@ <glx rop="25"/> </function> - <function name="Indexi" offset="48" vectorequiv="Indexiv" deprecated="3.1" - exec="loopback"> + <function name="Indexi" offset="48" vectorequiv="Indexiv" deprecated="3.1"> <param name="c" type="GLint"/> </function> - <function name="Indexiv" offset="49" deprecated="3.1" exec="loopback"> + <function name="Indexiv" offset="49" deprecated="3.1"> <param name="c" type="const GLint *" count="1"/> <glx rop="26"/> </function> - <function name="Indexs" offset="50" vectorequiv="Indexsv" deprecated="3.1" - exec="loopback"> + <function name="Indexs" offset="50" vectorequiv="Indexsv" deprecated="3.1"> <param name="c" type="GLshort"/> </function> - <function name="Indexsv" offset="51" deprecated="3.1" exec="loopback"> + <function name="Indexsv" offset="51" deprecated="3.1"> <param name="c" type="const GLshort *" count="1"/> <glx rop="27"/> </function> <function name="Normal3b" offset="52" vectorequiv="Normal3bv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="nx" type="GLbyte"/> <param name="ny" type="GLbyte"/> <param name="nz" type="GLbyte"/> </function> - <function name="Normal3bv" offset="53" deprecated="3.1" exec="loopback"> + <function name="Normal3bv" offset="53" deprecated="3.1"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="28"/> </function> <function name="Normal3d" offset="54" vectorequiv="Normal3dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="nx" type="GLdouble"/> <param name="ny" type="GLdouble"/> <param name="nz" type="GLdouble"/> </function> - <function name="Normal3dv" offset="55" deprecated="3.1" exec="loopback"> + <function name="Normal3dv" offset="55" deprecated="3.1"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="29"/> </function> @@ -1468,25 +1451,25 @@ </function> <function name="Normal3i" offset="58" vectorequiv="Normal3iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="nx" type="GLint"/> <param name="ny" type="GLint"/> <param name="nz" type="GLint"/> </function> - <function name="Normal3iv" offset="59" deprecated="3.1" exec="loopback"> + <function name="Normal3iv" offset="59" deprecated="3.1"> <param name="v" type="const GLint *" count="3"/> <glx rop="31"/> </function> <function name="Normal3s" offset="60" vectorequiv="Normal3sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="nx" type="GLshort"/> <param name="ny" type="GLshort"/> <param name="nz" type="GLshort"/> </function> - <function name="Normal3sv" offset="61" deprecated="3.1" exec="loopback"> + <function name="Normal3sv" offset="61" deprecated="3.1"> <param name="v" type="const GLshort *" count="3"/> <glx rop="32"/> </function> @@ -1635,15 +1618,14 @@ <glx rop="44"/> </function> - <function name="Rectd" offset="86" vectorequiv="Rectdv" deprecated="3.1" - exec="loopback"> + <function name="Rectd" offset="86" vectorequiv="Rectdv" deprecated="3.1"> <param name="x1" type="GLdouble"/> <param name="y1" type="GLdouble"/> <param name="x2" type="GLdouble"/> <param name="y2" type="GLdouble"/> </function> - <function name="Rectdv" offset="87" deprecated="3.1" exec="loopback"> + <function name="Rectdv" offset="87" deprecated="3.1"> <param name="v1" type="const GLdouble *" count="2"/> <param name="v2" type="const GLdouble *" count="2"/> <glx rop="45"/> @@ -1657,46 +1639,44 @@ <param name="y2" type="GLfloat"/> </function> - <function name="Rectfv" offset="89" deprecated="3.1" exec="loopback"> + <function name="Rectfv" offset="89" deprecated="3.1"> <param name="v1" type="const GLfloat *" count="2"/> <param name="v2" type="const GLfloat *" count="2"/> <glx rop="46"/> </function> - <function name="Recti" offset="90" vectorequiv="Rectiv" deprecated="3.1" - exec="loopback"> + <function name="Recti" offset="90" vectorequiv="Rectiv" deprecated="3.1"> <param name="x1" type="GLint"/> <param name="y1" type="GLint"/> <param name="x2" type="GLint"/> <param name="y2" type="GLint"/> </function> - <function name="Rectiv" offset="91" deprecated="3.1" exec="loopback"> + <function name="Rectiv" offset="91" deprecated="3.1"> <param name="v1" type="const GLint *" count="2"/> <param name="v2" type="const GLint *" count="2"/> <glx rop="47"/> </function> - <function name="Rects" offset="92" vectorequiv="Rectsv" deprecated="3.1" - exec="loopback"> + <function name="Rects" offset="92" vectorequiv="Rectsv" deprecated="3.1"> <param name="x1" type="GLshort"/> <param name="y1" type="GLshort"/> <param name="x2" type="GLshort"/> <param name="y2" type="GLshort"/> </function> - <function name="Rectsv" offset="93" deprecated="3.1" exec="loopback"> + <function name="Rectsv" offset="93" deprecated="3.1"> <param name="v1" type="const GLshort *" count="2"/> <param name="v2" type="const GLshort *" count="2"/> <glx rop="48"/> </function> <function name="TexCoord1d" offset="94" vectorequiv="TexCoord1dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLdouble"/> </function> - <function name="TexCoord1dv" offset="95" deprecated="3.1" exec="loopback"> + <function name="TexCoord1dv" offset="95" deprecated="3.1"> <param name="v" type="const GLdouble *" count="1"/> <glx rop="49"/> </function> @@ -1713,32 +1693,32 @@ </function> <function name="TexCoord1i" offset="98" vectorequiv="TexCoord1iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLint"/> </function> - <function name="TexCoord1iv" offset="99" deprecated="3.1" exec="loopback"> + <function name="TexCoord1iv" offset="99" deprecated="3.1"> <param name="v" type="const GLint *" count="1"/> <glx rop="51"/> </function> <function name="TexCoord1s" offset="100" vectorequiv="TexCoord1sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLshort"/> </function> - <function name="TexCoord1sv" offset="101" deprecated="3.1" exec="loopback"> + <function name="TexCoord1sv" offset="101" deprecated="3.1"> <param name="v" type="const GLshort *" count="1"/> <glx rop="52"/> </function> <function name="TexCoord2d" offset="102" vectorequiv="TexCoord2dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="TexCoord2dv" offset="103" deprecated="3.1" exec="loopback"> + <function name="TexCoord2dv" offset="103" deprecated="3.1"> <param name="v" type="const GLdouble *" count="2"/> <glx rop="53"/> </function> @@ -1756,35 +1736,35 @@ </function> <function name="TexCoord2i" offset="106" vectorequiv="TexCoord2iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="TexCoord2iv" offset="107" deprecated="3.1" exec="loopback"> + <function name="TexCoord2iv" offset="107" deprecated="3.1"> <param name="v" type="const GLint *" count="2"/> <glx rop="55"/> </function> <function name="TexCoord2s" offset="108" vectorequiv="TexCoord2sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="TexCoord2sv" offset="109" deprecated="3.1" exec="loopback"> + <function name="TexCoord2sv" offset="109" deprecated="3.1"> <param name="v" type="const GLshort *" count="2"/> <glx rop="56"/> </function> <function name="TexCoord3d" offset="110" vectorequiv="TexCoord3dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="TexCoord3dv" offset="111" deprecated="3.1" exec="loopback"> + <function name="TexCoord3dv" offset="111" deprecated="3.1"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="57"/> </function> @@ -1803,38 +1783,38 @@ </function> <function name="TexCoord3i" offset="114" vectorequiv="TexCoord3iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="TexCoord3iv" offset="115" deprecated="3.1" exec="loopback"> + <function name="TexCoord3iv" offset="115" deprecated="3.1"> <param name="v" type="const GLint *" count="3"/> <glx rop="59"/> </function> <function name="TexCoord3s" offset="116" vectorequiv="TexCoord3sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="TexCoord3sv" offset="117" deprecated="3.1" exec="loopback"> + <function name="TexCoord3sv" offset="117" deprecated="3.1"> <param name="v" type="const GLshort *" count="3"/> <glx rop="60"/> </function> <function name="TexCoord4d" offset="118" vectorequiv="TexCoord4dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> <param name="q" type="GLdouble"/> </function> - <function name="TexCoord4dv" offset="119" deprecated="3.1" exec="loopback"> + <function name="TexCoord4dv" offset="119" deprecated="3.1"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="61"/> </function> @@ -1854,38 +1834,38 @@ </function> <function name="TexCoord4i" offset="122" vectorequiv="TexCoord4iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> <param name="q" type="GLint"/> </function> - <function name="TexCoord4iv" offset="123" deprecated="3.1" exec="loopback"> + <function name="TexCoord4iv" offset="123" deprecated="3.1"> <param name="v" type="const GLint *" count="4"/> <glx rop="63"/> </function> <function name="TexCoord4s" offset="124" vectorequiv="TexCoord4sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> <param name="q" type="GLshort"/> </function> - <function name="TexCoord4sv" offset="125" deprecated="3.1" exec="loopback"> + <function name="TexCoord4sv" offset="125" deprecated="3.1"> <param name="v" type="const GLshort *" count="4"/> <glx rop="64"/> </function> <function name="Vertex2d" offset="126" vectorequiv="Vertex2dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="Vertex2dv" offset="127" deprecated="3.1" exec="loopback"> + <function name="Vertex2dv" offset="127" deprecated="3.1"> <param name="v" type="const GLdouble *" count="2"/> <glx rop="65"/> </function> @@ -1903,35 +1883,35 @@ </function> <function name="Vertex2i" offset="130" vectorequiv="Vertex2iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="Vertex2iv" offset="131" deprecated="3.1" exec="loopback"> + <function name="Vertex2iv" offset="131" deprecated="3.1"> <param name="v" type="const GLint *" count="2"/> <glx rop="67"/> </function> <function name="Vertex2s" offset="132" vectorequiv="Vertex2sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="Vertex2sv" offset="133" deprecated="3.1" exec="loopback"> + <function name="Vertex2sv" offset="133" deprecated="3.1"> <param name="v" type="const GLshort *" count="2"/> <glx rop="68"/> </function> <function name="Vertex3d" offset="134" vectorequiv="Vertex3dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="Vertex3dv" offset="135" deprecated="3.1" exec="loopback"> + <function name="Vertex3dv" offset="135" deprecated="3.1"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="69"/> </function> @@ -1950,38 +1930,38 @@ </function> <function name="Vertex3i" offset="138" vectorequiv="Vertex3iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="Vertex3iv" offset="139" deprecated="3.1" exec="loopback"> + <function name="Vertex3iv" offset="139" deprecated="3.1"> <param name="v" type="const GLint *" count="3"/> <glx rop="71"/> </function> <function name="Vertex3s" offset="140" vectorequiv="Vertex3sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="Vertex3sv" offset="141" deprecated="3.1" exec="loopback"> + <function name="Vertex3sv" offset="141" deprecated="3.1"> <param name="v" type="const GLshort *" count="3"/> <glx rop="72"/> </function> <function name="Vertex4d" offset="142" vectorequiv="Vertex4dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <param name="w" type="GLdouble"/> </function> - <function name="Vertex4dv" offset="143" deprecated="3.1" exec="loopback"> + <function name="Vertex4dv" offset="143" deprecated="3.1"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="73"/> </function> @@ -2001,27 +1981,27 @@ </function> <function name="Vertex4i" offset="146" vectorequiv="Vertex4iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> <param name="w" type="GLint"/> </function> - <function name="Vertex4iv" offset="147" deprecated="3.1" exec="loopback"> + <function name="Vertex4iv" offset="147" deprecated="3.1"> <param name="v" type="const GLint *" count="4"/> <glx rop="75"/> </function> <function name="Vertex4s" offset="148" vectorequiv="Vertex4sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> <param name="w" type="GLshort"/> </function> - <function name="Vertex4sv" offset="149" deprecated="3.1" exec="loopback"> + <function name="Vertex4sv" offset="149" deprecated="3.1"> <param name="v" type="const GLshort *" count="4"/> <glx rop="76"/> </function> @@ -2141,8 +2121,7 @@ <glx rop="95"/> </function> - <function name="Materialf" offset="169" es1="1.0" deprecated="3.1" - exec="loopback"> + <function name="Materialf" offset="169" es1="1.0" deprecated="3.1"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> @@ -2157,14 +2136,14 @@ <glx rop="97"/> </function> - <function name="Materiali" offset="171" deprecated="3.1" exec="loopback"> + <function name="Materiali" offset="171" deprecated="3.1"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="98"/> </function> - <function name="Materialiv" offset="172" deprecated="3.1" exec="loopback"> + <function name="Materialiv" offset="172" deprecated="3.1"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> @@ -2545,12 +2524,11 @@ </function> <function name="EvalCoord1d" offset="228" vectorequiv="EvalCoord1dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="u" type="GLdouble"/> </function> - <function name="EvalCoord1dv" offset="229" deprecated="3.1" - exec="loopback"> + <function name="EvalCoord1dv" offset="229" deprecated="3.1"> <param name="u" type="const GLdouble *" count="1"/> <glx rop="151"/> </function> @@ -2560,20 +2538,18 @@ <param name="u" type="GLfloat"/> </function> - <function name="EvalCoord1fv" offset="231" deprecated="3.1" - exec="loopback"> + <function name="EvalCoord1fv" offset="231" deprecated="3.1"> <param name="u" type="const GLfloat *" count="1"/> <glx rop="152"/> </function> <function name="EvalCoord2d" offset="232" vectorequiv="EvalCoord2dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="u" type="GLdouble"/> <param name="v" type="GLdouble"/> </function> - <function name="EvalCoord2dv" offset="233" deprecated="3.1" - exec="loopback"> + <function name="EvalCoord2dv" offset="233" deprecated="3.1"> <param name="u" type="const GLdouble *" count="2"/> <glx rop="153"/> </function> @@ -2584,8 +2560,7 @@ <param name="v" type="GLfloat"/> </function> - <function name="EvalCoord2fv" offset="235" deprecated="3.1" - exec="loopback"> + <function name="EvalCoord2fv" offset="235" deprecated="3.1"> <param name="u" type="const GLfloat *" count="2"/> <glx rop="154"/> </function> @@ -3439,11 +3414,11 @@ </function> <function name="Indexub" offset="315" vectorequiv="Indexubv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="c" type="GLubyte"/> </function> - <function name="Indexubv" offset="316" deprecated="3.1" exec="loopback"> + <function name="Indexubv" offset="316" deprecated="3.1"> <param name="c" type="const GLubyte *" count="1"/> <glx rop="194"/> </function> @@ -4343,26 +4318,29 @@ <enum name="DOT3_RGB" value="0x86AE"/> <enum name="DOT3_RGBA" value="0x86AF"/> - <function name="ActiveTexture" alias="ActiveTextureARB" es1="1.0" - es2="2.0"> + <function name="ActiveTexture" es1="1.0" + es2="2.0" offset="374"> <param name="texture" type="GLenum"/> + <glx rop="197"/> </function> - <function name="ClientActiveTexture" alias="ClientActiveTextureARB" - es1="1.0" deprecated="3.1"> + <function name="ClientActiveTexture" + es1="1.0" deprecated="3.1" offset="375"> <param name="texture" type="GLenum"/> + <glx handcode="true"/> </function> - <function name="MultiTexCoord1d" alias="MultiTexCoord1dARB" - deprecated="3.1"> + <function name="MultiTexCoord1d" + deprecated="3.1" offset="376"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> </function> - <function name="MultiTexCoord1dv" alias="MultiTexCoord1dvARB" - deprecated="3.1"> + <function name="MultiTexCoord1dv" + deprecated="3.1" offset="377"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="1"/> + <glx rop="198"/> </function> <function name="MultiTexCoord1f" alias="MultiTexCoord1fARB" @@ -4377,41 +4355,44 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord1i" alias="MultiTexCoord1iARB" - deprecated="3.1"> + <function name="MultiTexCoord1i" + deprecated="3.1" offset="380"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> </function> - <function name="MultiTexCoord1iv" alias="MultiTexCoord1ivARB" - deprecated="3.1"> + <function name="MultiTexCoord1iv" + deprecated="3.1" offset="381"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="1"/> + <glx rop="200"/> </function> - <function name="MultiTexCoord1s" alias="MultiTexCoord1sARB" - deprecated="3.1"> + <function name="MultiTexCoord1s" + deprecated="3.1" offset="382"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> </function> - <function name="MultiTexCoord1sv" alias="MultiTexCoord1svARB" - deprecated="3.1"> + <function name="MultiTexCoord1sv" + deprecated="3.1" offset="383"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="1"/> + <glx rop="201"/> </function> - <function name="MultiTexCoord2d" alias="MultiTexCoord2dARB" - deprecated="3.1"> + <function name="MultiTexCoord2d" + deprecated="3.1" offset="384"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="MultiTexCoord2dv" alias="MultiTexCoord2dvARB" - deprecated="3.1"> + <function name="MultiTexCoord2dv" + deprecated="3.1" offset="385"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="2"/> + <glx rop="202"/> </function> <function name="MultiTexCoord2f" alias="MultiTexCoord2fARB" @@ -4427,44 +4408,47 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord2i" alias="MultiTexCoord2iARB" - deprecated="3.1"> + <function name="MultiTexCoord2i" + deprecated="3.1" offset="388"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="MultiTexCoord2iv" alias="MultiTexCoord2ivARB" - deprecated="3.1"> + <function name="MultiTexCoord2iv" + deprecated="3.1" offset="389"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="2"/> + <glx rop="204"/> </function> - <function name="MultiTexCoord2s" alias="MultiTexCoord2sARB" - deprecated="3.1"> + <function name="MultiTexCoord2s" + deprecated="3.1" offset="390"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="MultiTexCoord2sv" alias="MultiTexCoord2svARB" - deprecated="3.1"> + <function name="MultiTexCoord2sv" + deprecated="3.1" offset="391"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="2"/> + <glx rop="205"/> </function> - <function name="MultiTexCoord3d" alias="MultiTexCoord3dARB" - deprecated="3.1"> + <function name="MultiTexCoord3d" + deprecated="3.1" offset="392"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="MultiTexCoord3dv" alias="MultiTexCoord3dvARB" - deprecated="3.1"> + <function name="MultiTexCoord3dv" + deprecated="3.1" offset="393"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="3"/> + <glx rop="206"/> </function> <function name="MultiTexCoord3f" alias="MultiTexCoord3fARB" @@ -4481,36 +4465,38 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord3i" alias="MultiTexCoord3iARB" - deprecated="3.1"> + <function name="MultiTexCoord3i" + deprecated="3.1" offset="396"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="MultiTexCoord3iv" alias="MultiTexCoord3ivARB" - deprecated="3.1"> + <function name="MultiTexCoord3iv" + deprecated="3.1" offset="397"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="3"/> + <glx rop="208"/> </function> - <function name="MultiTexCoord3s" alias="MultiTexCoord3sARB" - deprecated="3.1"> + <function name="MultiTexCoord3s" + deprecated="3.1" offset="398"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="MultiTexCoord3sv" alias="MultiTexCoord3svARB" - deprecated="3.1"> + <function name="MultiTexCoord3sv" + deprecated="3.1" offset="399"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="3"/> + <glx rop="209"/> </function> - <function name="MultiTexCoord4d" alias="MultiTexCoord4dARB" - deprecated="3.1"> + <function name="MultiTexCoord4d" + deprecated="3.1" offset="400"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> @@ -4518,10 +4504,11 @@ <param name="q" type="GLdouble"/> </function> - <function name="MultiTexCoord4dv" alias="MultiTexCoord4dvARB" - deprecated="3.1"> + <function name="MultiTexCoord4dv" + deprecated="3.1" offset="401"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="4"/> + <glx rop="210"/> </function> <function name="MultiTexCoord4f" alias="MultiTexCoord4fARB" es1="1.0" @@ -4539,8 +4526,8 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord4i" alias="MultiTexCoord4iARB" - deprecated="3.1"> + <function name="MultiTexCoord4i" + deprecated="3.1" offset="404"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> @@ -4548,14 +4535,15 @@ <param name="q" type="GLint"/> </function> - <function name="MultiTexCoord4iv" alias="MultiTexCoord4ivARB" - deprecated="3.1"> + <function name="MultiTexCoord4iv" + deprecated="3.1" offset="405"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="4"/> + <glx rop="212"/> </function> - <function name="MultiTexCoord4s" alias="MultiTexCoord4sARB" - deprecated="3.1"> + <function name="MultiTexCoord4s" + deprecated="3.1" offset="406"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> @@ -4563,39 +4551,45 @@ <param name="q" type="GLshort"/> </function> - <function name="MultiTexCoord4sv" alias="MultiTexCoord4svARB" - deprecated="3.1"> + <function name="MultiTexCoord4sv" + deprecated="3.1" offset="407"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="4"/> + <glx rop="213"/> </function> - <function name="LoadTransposeMatrixf" alias="LoadTransposeMatrixfARB" - deprecated="3.1"> + <function name="LoadTransposeMatrixf" + deprecated="3.1" offset="assign"> <param name="m" type="const GLfloat *"/> + <glx handcode="true"/> </function> - <function name="LoadTransposeMatrixd" alias="LoadTransposeMatrixdARB" - deprecated="3.1"> + <function name="LoadTransposeMatrixd" + deprecated="3.1" offset="assign"> <param name="m" type="const GLdouble *"/> + <glx handcode="true"/> </function> - <function name="MultTransposeMatrixf" alias="MultTransposeMatrixfARB" - deprecated="3.1"> + <function name="MultTransposeMatrixf" + deprecated="3.1" offset="assign"> <param name="m" type="const GLfloat *"/> + <glx handcode="true"/> </function> - <function name="MultTransposeMatrixd" alias="MultTransposeMatrixdARB" - deprecated="3.1"> + <function name="MultTransposeMatrixd" + deprecated="3.1" offset="assign"> <param name="m" type="const GLdouble *"/> + <glx handcode="true"/> </function> - <function name="SampleCoverage" alias="SampleCoverageARB" es1="1.0" - es2="2.0"> + <function name="SampleCoverage" es1="1.0" + es2="2.0" offset="assign"> <param name="value" type="GLclampf"/> <param name="invert" type="GLboolean"/> + <glx rop="229"/> </function> - <function name="CompressedTexImage3D" alias="CompressedTexImage3DARB" es2="3.0"> + <function name="CompressedTexImage3D" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4603,33 +4597,36 @@ <param name="height" type="GLsizei"/> <param name="depth" type="GLsizei"/> <param name="border" type="GLint"/> - <param name="imageSize" type="GLsizei"/> - <param name="data" type="const GLvoid *"/> + <param name="imageSize" type="GLsizei" counter="true"/> + <param name="data" type="const GLvoid *" count="imageSize"/> + <glx rop="216" handcode="client"/> </function> - <function name="CompressedTexImage2D" alias="CompressedTexImage2DARB" - es1="1.0" es2="2.0"> + <function name="CompressedTexImage2D" + es1="1.0" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="border" type="GLint"/> - <param name="imageSize" type="GLsizei"/> - <param name="data" type="const GLvoid *"/> + <param name="imageSize" type="GLsizei" counter="true"/> + <param name="data" type="const GLvoid *" count="imageSize"/> + <glx rop="215" handcode="client"/> </function> - <function name="CompressedTexImage1D" alias="CompressedTexImage1DARB"> + <function name="CompressedTexImage1D" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="border" type="GLint"/> - <param name="imageSize" type="GLsizei"/> - <param name="data" type="const GLvoid *"/> + <param name="imageSize" type="GLsizei" counter="true"/> + <param name="data" type="const GLvoid *" count="imageSize"/> + <glx rop="214" handcode="client"/> </function> - <function name="CompressedTexSubImage3D" alias="CompressedTexSubImage3DARB" es2="3.0"> + <function name="CompressedTexSubImage3D" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4639,12 +4636,13 @@ <param name="height" type="GLsizei"/> <param name="depth" type="GLsizei"/> <param name="format" type="GLenum"/> - <param name="imageSize" type="GLsizei"/> - <param name="data" type="const GLvoid *"/> + <param name="imageSize" type="GLsizei" counter="true"/> + <param name="data" type="const GLvoid *" count="imageSize"/> + <glx rop="219" handcode="client"/> </function> - <function name="CompressedTexSubImage2D" alias="CompressedTexSubImage2DARB" - es1="1.0" es2="2.0"> + <function name="CompressedTexSubImage2D" + es1="1.0" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4652,24 +4650,27 @@ <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="format" type="GLenum"/> - <param name="imageSize" type="GLsizei"/> - <param name="data" type="const GLvoid *"/> + <param name="imageSize" type="GLsizei" counter="true"/> + <param name="data" type="const GLvoid *" count="imageSize"/> + <glx rop="218" handcode="client"/> </function> - <function name="CompressedTexSubImage1D" alias="CompressedTexSubImage1DARB"> + <function name="CompressedTexSubImage1D" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> <param name="width" type="GLsizei"/> <param name="format" type="GLenum"/> - <param name="imageSize" type="GLsizei"/> - <param name="data" type="const GLvoid *"/> + <param name="imageSize" type="GLsizei" counter="true"/> + <param name="data" type="const GLvoid *" count="imageSize"/> + <glx rop="217" handcode="client"/> </function> - <function name="GetCompressedTexImage" alias="GetCompressedTexImageARB"> + <function name="GetCompressedTexImage" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="img" type="GLvoid *" output="true"/> + <glx sop="160" handcode="true"/> </function> </category> @@ -4687,19 +4688,19 @@ <size name="Get" mode="get"/> </enum> <enum name="POINT_SIZE_MIN" count="1" value="0x8126"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> <size name="Get" mode="get"/> </enum> <enum name="POINT_SIZE_MAX" count="1" value="0x8127"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> <size name="Get" mode="get"/> </enum> <enum name="POINT_FADE_THRESHOLD_SIZE" count="1" value="0x8128"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> <size name="Get" mode="get"/> </enum> <enum name="POINT_DISTANCE_ATTENUATION" count="3" value="0x8129"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> <size name="Get" mode="get"/> </enum> <enum name="GENERATE_MIPMAP" count="1" value="0x8191"> @@ -4788,11 +4789,12 @@ </enum> <enum name="COMPARE_R_TO_TEXTURE" value="0x884E"/> - <function name="BlendFuncSeparate" alias="BlendFuncSeparateEXT" es2="2.0"> + <function name="BlendFuncSeparate" es2="2.0" offset="assign"> <param name="sfactorRGB" type="GLenum"/> <param name="dfactorRGB" type="GLenum"/> <param name="sfactorAlpha" type="GLenum"/> <param name="dfactorAlpha" type="GLenum"/> + <glx rop="4134"/> </function> <function name="FogCoordf" alias="FogCoordfEXT" deprecated="3.1"> @@ -4803,26 +4805,29 @@ <param name="coord" type="const GLfloat *"/> </function> - <function name="FogCoordd" alias="FogCoorddEXT" deprecated="3.1"> + <function name="FogCoordd" deprecated="3.1" offset="assign"> <param name="coord" type="GLdouble"/> </function> - <function name="FogCoorddv" alias="FogCoorddvEXT" deprecated="3.1"> - <param name="coord" type="const GLdouble *"/> + <function name="FogCoorddv" deprecated="3.1" offset="assign"> + <param name="coord" type="const GLdouble *" count="1"/> + <glx rop="4125"/> </function> - <function name="FogCoordPointer" alias="FogCoordPointerEXT" - deprecated="3.1"> + <function name="FogCoordPointer" + deprecated="3.1" offset="assign"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> + <glx handcode="true"/> </function> - <function name="MultiDrawArrays" alias="MultiDrawArraysEXT"> + <function name="MultiDrawArrays" offset="assign"> <param name="mode" type="GLenum"/> <param name="first" type="const GLint *"/> <param name="count" type="const GLsizei *"/> <param name="primcount" type="GLsizei"/> + <glx handcode="true"/> </function> <function name="MultiDrawElements" alias="MultiDrawElementsEXT"> @@ -4833,48 +4838,54 @@ <param name="primcount" type="GLsizei"/> </function> - <function name="PointParameterf" alias="PointParameterfEXT" es1="1.1"> + <function name="PointParameterf" es1="1.1" offset="assign"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> + <glx rop="2065"/> </function> - <function name="PointParameterfv" alias="PointParameterfvEXT" es1="1.1"> + <function name="PointParameterfv" es1="1.1" offset="assign"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfloat *"/> + <param name="params" type="const GLfloat *" variable_param="pname"/> + <glx rop="2066"/> </function> - <function name="PointParameteri" alias="PointParameteriNV"> + <function name="PointParameteri" offset="assign"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> + <glx rop="4221"/> </function> - <function name="PointParameteriv" alias="PointParameterivNV"> + <function name="PointParameteriv" offset="assign"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *"/> + <param name="params" type="const GLint *" variable_param="pname"/> + <glx rop="4222"/> </function> - <function name="SecondaryColor3b" alias="SecondaryColor3bEXT" - deprecated="3.1"> + <function name="SecondaryColor3b" + deprecated="3.1" offset="assign"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="SecondaryColor3bv" alias="SecondaryColor3bvEXT" - deprecated="3.1"> - <param name="v" type="const GLbyte *"/> + <function name="SecondaryColor3bv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLbyte *" count="3"/> + <glx rop="4126"/> </function> - <function name="SecondaryColor3d" alias="SecondaryColor3dEXT" - deprecated="3.1"> + <function name="SecondaryColor3d" + deprecated="3.1" offset="assign"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="SecondaryColor3dv" alias="SecondaryColor3dvEXT" - deprecated="3.1"> - <param name="v" type="const GLdouble *"/> + <function name="SecondaryColor3dv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLdouble *" count="3"/> + <glx rop="4130"/> </function> <function name="SecondaryColor3f" alias="SecondaryColor3fEXT" @@ -4889,148 +4900,169 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="SecondaryColor3i" alias="SecondaryColor3iEXT" - deprecated="3.1"> + <function name="SecondaryColor3i" + deprecated="3.1" offset="assign"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="SecondaryColor3iv" alias="SecondaryColor3ivEXT" - deprecated="3.1"> - <param name="v" type="const GLint *"/> + <function name="SecondaryColor3iv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLint *" count="3"/> + <glx rop="4128"/> </function> - <function name="SecondaryColor3s" alias="SecondaryColor3sEXT" - deprecated="3.1"> + <function name="SecondaryColor3s" + deprecated="3.1" offset="assign"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="SecondaryColor3sv" alias="SecondaryColor3svEXT" - deprecated="3.1"> - <param name="v" type="const GLshort *"/> + <function name="SecondaryColor3sv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLshort *" count="3"/> + <glx rop="4127"/> </function> - <function name="SecondaryColor3ub" alias="SecondaryColor3ubEXT" - deprecated="3.1"> + <function name="SecondaryColor3ub" + deprecated="3.1" offset="assign"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="SecondaryColor3ubv" alias="SecondaryColor3ubvEXT" - deprecated="3.1"> - <param name="v" type="const GLubyte *"/> + <function name="SecondaryColor3ubv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLubyte *" count="3"/> + <glx rop="4131"/> </function> - <function name="SecondaryColor3ui" alias="SecondaryColor3uiEXT" - deprecated="3.1"> + <function name="SecondaryColor3ui" + deprecated="3.1" offset="assign"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="SecondaryColor3uiv" alias="SecondaryColor3uivEXT" - deprecated="3.1"> - <param name="v" type="const GLuint *"/> + <function name="SecondaryColor3uiv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLuint *" count="3"/> + <glx rop="4133"/> </function> - <function name="SecondaryColor3us" alias="SecondaryColor3usEXT" - deprecated="3.1"> + <function name="SecondaryColor3us" + deprecated="3.1" offset="assign"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="SecondaryColor3usv" alias="SecondaryColor3usvEXT" - deprecated="3.1"> - <param name="v" type="const GLushort *"/> + <function name="SecondaryColor3usv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLushort *" count="3"/> + <glx rop="4132"/> </function> - <function name="SecondaryColorPointer" alias="SecondaryColorPointerEXT" - deprecated="3.1"> + <function name="SecondaryColorPointer" + deprecated="3.1" offset="assign"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> + <glx handcode="true"/> </function> - <function name="WindowPos2d" alias="WindowPos2dMESA" deprecated="3.1"> + <function name="WindowPos2d" deprecated="3.1" offset="assign"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> + <glx handcode="true"/> </function> - <function name="WindowPos2dv" alias="WindowPos2dvMESA" deprecated="3.1"> + <function name="WindowPos2dv" deprecated="3.1" offset="assign"> <param name="v" type="const GLdouble *"/> + <glx handcode="true"/> </function> - <function name="WindowPos2f" alias="WindowPos2fMESA" deprecated="3.1"> + <function name="WindowPos2f" deprecated="3.1" offset="assign"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> + <glx handcode="true"/> </function> - <function name="WindowPos2fv" alias="WindowPos2fvMESA" deprecated="3.1"> + <function name="WindowPos2fv" deprecated="3.1" offset="assign"> <param name="v" type="const GLfloat *"/> + <glx handcode="true"/> </function> - <function name="WindowPos2i" alias="WindowPos2iMESA" deprecated="3.1"> + <function name="WindowPos2i" deprecated="3.1" offset="assign"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> + <glx handcode="true"/> </function> - <function name="WindowPos2iv" alias="WindowPos2ivMESA" deprecated="3.1"> + <function name="WindowPos2iv" deprecated="3.1" offset="assign"> <param name="v" type="const GLint *"/> + <glx handcode="true"/> </function> - <function name="WindowPos2s" alias="WindowPos2sMESA" deprecated="3.1"> + <function name="WindowPos2s" deprecated="3.1" offset="assign"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> + <glx handcode="true"/> </function> - <function name="WindowPos2sv" alias="WindowPos2svMESA" deprecated="3.1"> + <function name="WindowPos2sv" deprecated="3.1" offset="assign"> <param name="v" type="const GLshort *"/> + <glx handcode="true"/> </function> - <function name="WindowPos3d" alias="WindowPos3dMESA" deprecated="3.1"> + <function name="WindowPos3d" deprecated="3.1" offset="assign"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> + <glx handcode="true"/> </function> - <function name="WindowPos3dv" alias="WindowPos3dvMESA" deprecated="3.1"> + <function name="WindowPos3dv" deprecated="3.1" offset="assign"> <param name="v" type="const GLdouble *"/> + <glx handcode="true"/> </function> - <function name="WindowPos3f" alias="WindowPos3fMESA" deprecated="3.1"> + <function name="WindowPos3f" deprecated="3.1" offset="assign"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="WindowPos3fv" alias="WindowPos3fvMESA" deprecated="3.1"> - <param name="v" type="const GLfloat *"/> + <function name="WindowPos3fv" deprecated="3.1" offset="assign"> + <param name="v" type="const GLfloat *" count="3"/> + <glx rop="230"/> </function> - <function name="WindowPos3i" alias="WindowPos3iMESA" deprecated="3.1"> + <function name="WindowPos3i" deprecated="3.1" offset="assign"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> + <glx handcode="true"/> </function> - <function name="WindowPos3iv" alias="WindowPos3ivMESA" deprecated="3.1"> + <function name="WindowPos3iv" deprecated="3.1" offset="assign"> <param name="v" type="const GLint *"/> + <glx handcode="true"/> </function> - <function name="WindowPos3s" alias="WindowPos3sMESA" deprecated="3.1"> + <function name="WindowPos3s" deprecated="3.1" offset="assign"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> + <glx handcode="true"/> </function> - <function name="WindowPos3sv" alias="WindowPos3svMESA" deprecated="3.1"> + <function name="WindowPos3sv" deprecated="3.1" offset="assign"> <param name="v" type="const GLshort *"/> + <glx handcode="true"/> </function> </category> @@ -5099,113 +5131,132 @@ <type name="intptr" size="4" glx_name="CARD32"/> <type name="sizeiptr" size="4" unsigned="true" glx_name="CARD32"/> - <function name="BindBuffer" alias="BindBufferARB" es1="1.1" es2="2.0"> + <function name="BindBuffer" es1="1.1" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="buffer" type="GLuint"/> + <glx ignore="true"/> </function> - <function name="BufferData" alias="BufferDataARB" es1="1.1" es2="2.0"> + <function name="BufferData" es1="1.1" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> - <param name="size" type="GLsizeiptr"/> - <param name="data" type="const GLvoid *"/> + <param name="size" type="GLsizeiptr" counter="true"/> + <param name="data" type="const GLvoid *" count="size" img_null_flag="true"/> <param name="usage" type="GLenum"/> + <glx ignore="true"/> </function> - <function name="BufferSubData" alias="BufferSubDataARB" es1="1.1" - es2="2.0"> + <function name="BufferSubData" es1="1.1" + es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> - <param name="size" type="GLsizeiptr"/> - <param name="data" type="const GLvoid *"/> + <param name="size" type="GLsizeiptr" counter="true"/> + <param name="data" type="const GLvoid *" count="size"/> + <glx ignore="true"/> </function> - <function name="DeleteBuffers" alias="DeleteBuffersARB" es1="1.1" - es2="2.0"> - <param name="n" type="GLsizei"/> - <param name="buffer" type="const GLuint *"/> + <function name="DeleteBuffers" es1="1.1" + es2="2.0" offset="assign"> + <param name="n" type="GLsizei" counter="true"/> + <param name="buffer" type="const GLuint *" count="n"/> + <glx ignore="true"/> </function> - <function name="GenBuffers" alias="GenBuffersARB" es1="1.1" es2="2.0"> + <function name="GenBuffers" es1="1.1" es2="2.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="buffer" type="GLuint *" output="true" count="n"/> + <glx ignore="true"/> </function> - <function name="GetBufferParameteriv" alias="GetBufferParameterivARB" - es1="1.1" es2="2.0"> + <function name="GetBufferParameteriv" + es1="1.1" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> + <glx ignore="true"/> </function> - <function name="GetBufferPointerv" alias="GetBufferPointervARB" es2="3.0"> + <function name="GetBufferPointerv" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLvoid **" output="true"/> + <glx ignore="true"/> </function> - <function name="GetBufferSubData" alias="GetBufferSubDataARB"> + <function name="GetBufferSubData" offset="assign"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> - <param name="size" type="GLsizeiptr"/> - <param name="data" type="GLvoid *" output="true"/> + <param name="size" type="GLsizeiptr" counter="true"/> + <param name="data" type="GLvoid *" output="true" count="size"/> + <glx ignore="true"/> </function> - <function name="IsBuffer" alias="IsBufferARB" es1="1.1" es2="2.0"> + <function name="IsBuffer" es1="1.1" es2="2.0" offset="assign"> <param name="buffer" type="GLuint"/> <return type="GLboolean"/> + <glx ignore="true"/> </function> - <function name="MapBuffer" alias="MapBufferARB"> + <function name="MapBuffer" offset="assign"> <param name="target" type="GLenum"/> <param name="access" type="GLenum"/> <return type="GLvoid *"/> + <glx ignore="true"/> </function> - <function name="UnmapBuffer" alias="UnmapBufferARB" es2="3.0"> + <function name="UnmapBuffer" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <return type="GLboolean"/> + <glx ignore="true"/> </function> - <function name="GenQueries" alias="GenQueriesARB" es2="3.0"> + <function name="GenQueries" es2="3.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="ids" type="GLuint *" output="true" count="n"/> + <glx sop="162" always_array="true"/> </function> - <function name="DeleteQueries" alias="DeleteQueriesARB" es2="3.0"> - <param name="n" type="GLsizei"/> - <param name="ids" type="const GLuint *"/> + <function name="DeleteQueries" es2="3.0" offset="assign"> + <param name="n" type="GLsizei" counter="true"/> + <param name="ids" type="const GLuint *" count="n"/> + <glx sop="161"/> </function> - <function name="IsQuery" alias="IsQueryARB" es2="3.0"> + <function name="IsQuery" es2="3.0" offset="assign"> <param name="id" type="GLuint"/> <return type="GLboolean"/> + <glx sop="163"/> </function> - <function name="BeginQuery" alias="BeginQueryARB" es2="3.0"> + <function name="BeginQuery" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="id" type="GLuint"/> + <glx rop="231"/> </function> - <function name="EndQuery" alias="EndQueryARB" es2="3.0"> + <function name="EndQuery" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> + <glx rop="232"/> </function> - <function name="GetQueryiv" alias="GetQueryivARB" es2="3.0"> + <function name="GetQueryiv" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> + <glx sop="164"/> </function> - <function name="GetQueryObjectiv" alias="GetQueryObjectivARB"> + <function name="GetQueryObjectiv" offset="assign"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> + <glx sop="165"/> </function> - <function name="GetQueryObjectuiv" alias="GetQueryObjectuivARB" es2="3.0"> + <function name="GetQueryObjectuiv" es2="3.0" offset="assign"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *" output="true" variable_param="pname"/> + <glx sop="166"/> </function> </category> @@ -5295,8 +5346,8 @@ <enum name="SHADING_LANGUAGE_VERSION" value="0x8B8C"/> <enum name="CURRENT_PROGRAM" value="0x8B8D"/> <enum name="POINT_SPRITE_COORD_ORIGIN" count="1" value="0x8CA0"> - <size name="PointParameterfvEXT"/> - <size name="PointParameterivNV"/> + <size name="PointParameterfv"/> + <size name="PointParameteriv"/> </enum> <enum name="LOWER_LEFT" value="0x8CA1"/> <enum name="UPPER_LEFT" value="0x8CA2"/> @@ -5304,15 +5355,17 @@ <enum name="STENCIL_BACK_VALUE_MASK" value="0x8CA4"/> <enum name="STENCIL_BACK_WRITEMASK" value="0x8CA5"/> - <function name="BlendEquationSeparate" alias="BlendEquationSeparateEXT" - es2="2.0"> + <function name="BlendEquationSeparate" + es2="2.0" offset="assign"> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> + <glx rop="4228"/> </function> - <function name="DrawBuffers" alias="DrawBuffersARB" es2="3.0"> + <function name="DrawBuffers" es2="3.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="bufs" type="const GLenum *" count="n"/> + <glx rop="233" large="true"/> </function> <function name="StencilFuncSeparate" offset="assign" es2="2.0"> @@ -5343,17 +5396,19 @@ <glx ignore="true"/> </function> - <function name="BindAttribLocation" alias="BindAttribLocationARB" - es2="2.0"> + <function name="BindAttribLocation" + es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="name" type="const GLchar *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="CompileShader" alias="CompileShaderARB" es2="2.0"> + <function name="CompileShader" es2="2.0" offset="assign"> <param name="shader" type="GLuint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> <function name="CreateProgram" offset="assign" es2="2.0"> @@ -5383,19 +5438,20 @@ <glx ignore="true"/> </function> - <function name="DisableVertexAttribArray" - alias="DisableVertexAttribArrayARB" es2="2.0"> + <function name="DisableVertexAttribArray" es2="2.0" offset="assign"> <param name="index" type="GLuint"/> <glx ignore="true"/> + <glx handcode="true"/> </function> - <function name="EnableVertexAttribArray" alias="EnableVertexAttribArrayARB" - es2="2.0"> + <function name="EnableVertexAttribArray" + es2="2.0" offset="assign"> <param name="index" type="GLuint"/> <glx ignore="true"/> + <glx handcode="true"/> </function> - <function name="GetActiveAttrib" alias="GetActiveAttribARB" es2="2.0"> + <function name="GetActiveAttrib" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei "/> @@ -5404,9 +5460,10 @@ <param name="type" type="GLenum *" output="true"/> <param name="name" type="GLchar *" output="true"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="GetActiveUniform" alias="GetActiveUniformARB" es2="2.0"> + <function name="GetActiveUniform" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> @@ -5415,6 +5472,7 @@ <param name="type" type="GLenum *" output="true"/> <param name="name" type="GLchar *" output="true"/> <glx ignore="true"/> + <glx ignore="true"/> </function> <function name="GetAttachedShaders" offset="assign" es2="2.0"> @@ -5425,11 +5483,12 @@ <glx ignore="true"/> </function> - <function name="GetAttribLocation" alias="GetAttribLocationARB" es2="2.0"> + <function name="GetAttribLocation" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> <return type="GLint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> <function name="GetProgramiv" offset="assign" es2="2.0"> @@ -5462,63 +5521,71 @@ <glx ignore="true"/> </function> - <function name="GetShaderSource" alias="GetShaderSourceARB" es2="2.0"> + <function name="GetShaderSource" es2="2.0" offset="assign"> <param name="shader" type="GLuint"/> <param name="bufSize" type="GLsizei"/> <param name="length" type="GLsizei *" output="true"/> <param name="source" type="GLchar *" output="true"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="GetUniformLocation" alias="GetUniformLocationARB" - es2="2.0"> + <function name="GetUniformLocation" + es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> <return type="GLint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="GetUniformfv" alias="GetUniformfvARB" es2="2.0"> + <function name="GetUniformfv" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> <param name="params" type="GLfloat *" output="true"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="GetUniformiv" alias="GetUniformivARB" es2="2.0"> + <function name="GetUniformiv" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> - <param name="params" type="GLint *"/> + <param name="params" type="GLint *" output="true"/> + <glx ignore="true"/> <glx ignore="true"/> </function> - <function name="GetVertexAttribdv" alias="GetVertexAttribdvARB"> + <function name="GetVertexAttribdv" offset="assign"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLdouble *" output="true" variable_param="pname"/> <glx ignore="true"/> + <glx handcode="client" vendorpriv="1301"/> </function> - <function name="GetVertexAttribfv" alias="GetVertexAttribfvARB" es2="2.0"> + <function name="GetVertexAttribfv" es2="2.0" offset="assign"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx ignore="true"/> + <glx handcode="client" vendorpriv="1302"/> </function> - <function name="GetVertexAttribiv" alias="GetVertexAttribivARB" es2="2.0"> + <function name="GetVertexAttribiv" es2="2.0" offset="assign"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx ignore="true"/> + <glx handcode="client" vendorpriv="1303"/> </function> - <function name="GetVertexAttribPointerv" alias="GetVertexAttribPointervNV" - es2="2.0"> + <function name="GetVertexAttribPointerv" + es2="2.0" offset="assign"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="pointer" type="GLvoid **" output="true"/> <glx ignore="true"/> + <glx handcode="true"/> </function> <function name="IsProgram" offset="assign" es2="2.0"> @@ -5533,162 +5600,186 @@ <glx ignore="true"/> </function> - <function name="LinkProgram" alias="LinkProgramARB" es2="2.0"> + <function name="LinkProgram" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="ShaderSource" alias="ShaderSourceARB" es2="2.0"> + <function name="ShaderSource" es2="2.0" offset="assign"> <param name="shader" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="string" type="const GLchar * const *"/> <param name="length" type="const GLint *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="UseProgram" alias="UseProgramObjectARB" es2="2.0"> + <function name="UseProgram" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform1f" alias="Uniform1fARB" es2="2.0"> + <function name="Uniform1f" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform2f" alias="Uniform2fARB" es2="2.0"> + <function name="Uniform2f" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform3f" alias="Uniform3fARB" es2="2.0"> + <function name="Uniform3f" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> <param name="v2" type="GLfloat"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform4f" alias="Uniform4fARB" es2="2.0"> + <function name="Uniform4f" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> <param name="v2" type="GLfloat"/> <param name="v3" type="GLfloat"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform1i" alias="Uniform1iARB" es2="2.0"> + <function name="Uniform1i" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform2i" alias="Uniform2iARB" es2="2.0"> + <function name="Uniform2i" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform3i" alias="Uniform3iARB" es2="2.0"> + <function name="Uniform3i" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> <param name="v2" type="GLint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform4i" alias="Uniform4iARB" es2="2.0"> + <function name="Uniform4i" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> <param name="v2" type="GLint"/> <param name="v3" type="GLint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform1fv" alias="Uniform1fvARB" es2="2.0"> + <function name="Uniform1fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform2fv" alias="Uniform2fvARB" es2="2.0"> + <function name="Uniform2fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform3fv" alias="Uniform3fvARB" es2="2.0"> + <function name="Uniform3fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform4fv" alias="Uniform4fvARB" es2="2.0"> + <function name="Uniform4fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform1iv" alias="Uniform1ivARB" es2="2.0"> + <function name="Uniform1iv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform2iv" alias="Uniform2ivARB" es2="2.0"> + <function name="Uniform2iv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform3iv" alias="Uniform3ivARB" es2="2.0"> + <function name="Uniform3iv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform4iv" alias="Uniform4ivARB" es2="2.0"> + <function name="Uniform4iv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="UniformMatrix2fv" alias="UniformMatrix2fvARB" es2="2.0"> + <function name="UniformMatrix2fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="UniformMatrix3fv" alias="UniformMatrix3fvARB" es2="2.0"> + <function name="UniformMatrix3fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="UniformMatrix4fv" alias="UniformMatrix4fvARB" es2="2.0"> + <function name="UniformMatrix4fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="ValidateProgram" alias="ValidateProgramARB" es2="2.0"> + <function name="ValidateProgram" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="VertexAttrib1d" alias="VertexAttrib1dARB"> + <function name="VertexAttrib1d" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> </function> - <function name="VertexAttrib1dv" alias="VertexAttrib1dvARB"> + <function name="VertexAttrib1dv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="1"/> + <glx rop="4197" doubles_in_order="true"/> </function> <function name="VertexAttrib1f" alias="VertexAttrib1fARB" es2="2.0"> <param name="index" type="GLuint"/> @@ -5698,23 +5789,25 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> - <function name="VertexAttrib1s" alias="VertexAttrib1sARB"> + <function name="VertexAttrib1s" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> </function> - <function name="VertexAttrib1sv" alias="VertexAttrib1svARB"> + <function name="VertexAttrib1sv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="1"/> + <glx rop="4189"/> </function> - <function name="VertexAttrib2d" alias="VertexAttrib2dARB"> + <function name="VertexAttrib2d" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="VertexAttrib2dv" alias="VertexAttrib2dvARB"> + <function name="VertexAttrib2dv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="2"/> + <glx rop="4198" doubles_in_order="true"/> </function> <function name="VertexAttrib2f" alias="VertexAttrib2fARB" es2="2.0"> <param name="index" type="GLuint"/> @@ -5725,25 +5818,27 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> - <function name="VertexAttrib2s" alias="VertexAttrib2sARB"> + <function name="VertexAttrib2s" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="VertexAttrib2sv" alias="VertexAttrib2svARB"> + <function name="VertexAttrib2sv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="2"/> + <glx rop="4190"/> </function> - <function name="VertexAttrib3d" alias="VertexAttrib3dARB"> + <function name="VertexAttrib3d" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="VertexAttrib3dv" alias="VertexAttrib3dvARB"> + <function name="VertexAttrib3dv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="3"/> + <glx rop="4199" doubles_in_order="true"/> </function> <function name="VertexAttrib3f" alias="VertexAttrib3fARB" es2="2.0"> <param name="index" type="GLuint"/> @@ -5755,62 +5850,71 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> - <function name="VertexAttrib3s" alias="VertexAttrib3sARB"> + <function name="VertexAttrib3s" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="VertexAttrib3sv" alias="VertexAttrib3svARB"> + <function name="VertexAttrib3sv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="3"/> + <glx rop="4191"/> </function> - <function name="VertexAttrib4Nbv" alias="VertexAttrib4NbvARB"> + <function name="VertexAttrib4Nbv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLbyte *"/> + <param name="v" type="const GLbyte *" count="4"/> + <glx rop="4235"/> </function> - <function name="VertexAttrib4Niv" alias="VertexAttrib4NivARB"> + <function name="VertexAttrib4Niv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="4"/> + <glx rop="4237"/> </function> - <function name="VertexAttrib4Nsv" alias="VertexAttrib4NsvARB"> + <function name="VertexAttrib4Nsv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="4"/> + <glx rop="4236"/> </function> - <function name="VertexAttrib4Nub" alias="VertexAttrib4NubARB"> + <function name="VertexAttrib4Nub" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLubyte"/> <param name="y" type="GLubyte"/> <param name="z" type="GLubyte"/> <param name="w" type="GLubyte"/> </function> - <function name="VertexAttrib4Nubv" alias="VertexAttrib4NubvARB"> + <function name="VertexAttrib4Nubv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLubyte *"/> + <param name="v" type="const GLubyte *" count="4"/> + <glx rop="4201"/> </function> - <function name="VertexAttrib4Nuiv" alias="VertexAttrib4NuivARB"> + <function name="VertexAttrib4Nuiv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLuint *"/> + <param name="v" type="const GLuint *" count="4"/> + <glx rop="4239"/> </function> - <function name="VertexAttrib4Nusv" alias="VertexAttrib4NusvARB"> + <function name="VertexAttrib4Nusv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLushort *"/> + <param name="v" type="const GLushort *" count="4"/> + <glx rop="4238"/> </function> - <function name="VertexAttrib4bv" alias="VertexAttrib4bvARB"> + <function name="VertexAttrib4bv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *" count="4"/> + <glx rop="4230"/> </function> - <function name="VertexAttrib4d" alias="VertexAttrib4dARB"> + <function name="VertexAttrib4d" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <param name="w" type="GLdouble"/> </function> - <function name="VertexAttrib4dv" alias="VertexAttrib4dvARB"> + <function name="VertexAttrib4dv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="4"/> + <glx rop="4200" doubles_in_order="true"/> </function> <function name="VertexAttrib4f" alias="VertexAttrib4fARB" es2="2.0"> <param name="index" type="GLuint"/> @@ -5823,42 +5927,48 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> - <function name="VertexAttrib4iv" alias="VertexAttrib4ivARB"> + <function name="VertexAttrib4iv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *" count="4"/> + <glx rop="4231"/> </function> - <function name="VertexAttrib4s" alias="VertexAttrib4sARB"> + <function name="VertexAttrib4s" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> <param name="w" type="GLshort"/> </function> - <function name="VertexAttrib4sv" alias="VertexAttrib4svARB"> + <function name="VertexAttrib4sv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="4"/> + <glx rop="4192"/> </function> - <function name="VertexAttrib4ubv" alias="VertexAttrib4ubvARB"> + <function name="VertexAttrib4ubv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> + <glx rop="4232"/> </function> - <function name="VertexAttrib4uiv" alias="VertexAttrib4uivARB"> + <function name="VertexAttrib4uiv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *" count="4"/> + <glx rop="4234"/> </function> - <function name="VertexAttrib4usv" alias="VertexAttrib4usvARB"> + <function name="VertexAttrib4usv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *" count="4"/> + <glx rop="4233"/> </function> - <function name="VertexAttribPointer" alias="VertexAttribPointerARB" - es2="2.0"> + <function name="VertexAttribPointer" + es2="2.0" offset="assign"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> + <glx handcode="true"/> </function> </category> @@ -5983,26 +6093,23 @@ <size name="Get" mode="get"/> </enum> - <function name="ActiveTextureARB" offset="374"> + <function name="ActiveTextureARB" alias="ActiveTexture"> <param name="texture" type="GLenum"/> - <glx rop="197"/> </function> - <function name="ClientActiveTextureARB" offset="375"> + <function name="ClientActiveTextureARB" alias="ClientActiveTexture"> <param name="texture" type="GLenum"/> - <glx handcode="true"/> </function> - <function name="MultiTexCoord1dARB" offset="376" - vectorequiv="MultiTexCoord1dvARB" exec="loopback"> + <function name="MultiTexCoord1dARB" + vectorequiv="MultiTexCoord1dv" alias="MultiTexCoord1d"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> </function> - <function name="MultiTexCoord1dvARB" offset="377" exec="loopback"> + <function name="MultiTexCoord1dvARB" alias="MultiTexCoord1dv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *" count="1"/> - <glx rop="198"/> + <param name="v" type="const GLdouble *"/> </function> <function name="MultiTexCoord1fARB" offset="378" @@ -6017,41 +6124,38 @@ <glx rop="199"/> </function> - <function name="MultiTexCoord1iARB" offset="380" - vectorequiv="MultiTexCoord1ivARB" exec="loopback"> + <function name="MultiTexCoord1iARB" + vectorequiv="MultiTexCoord1iv" alias="MultiTexCoord1i"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> </function> - <function name="MultiTexCoord1ivARB" offset="381" exec="loopback"> + <function name="MultiTexCoord1ivARB" alias="MultiTexCoord1iv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *" count="1"/> - <glx rop="200"/> + <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord1sARB" offset="382" - vectorequiv="MultiTexCoord1svARB" exec="loopback"> + <function name="MultiTexCoord1sARB" + vectorequiv="MultiTexCoord1sv" alias="MultiTexCoord1s"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> </function> - <function name="MultiTexCoord1svARB" offset="383" exec="loopback"> + <function name="MultiTexCoord1svARB" alias="MultiTexCoord1sv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *" count="1"/> - <glx rop="201"/> + <param name="v" type="const GLshort *"/> </function> - <function name="MultiTexCoord2dARB" offset="384" - vectorequiv="MultiTexCoord2dvARB" exec="loopback"> + <function name="MultiTexCoord2dARB" + vectorequiv="MultiTexCoord2dv" alias="MultiTexCoord2d"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="MultiTexCoord2dvARB" offset="385" exec="loopback"> + <function name="MultiTexCoord2dvARB" alias="MultiTexCoord2dv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *" count="2"/> - <glx rop="202"/> + <param name="v" type="const GLdouble *"/> </function> <function name="MultiTexCoord2fARB" offset="386" @@ -6067,44 +6171,41 @@ <glx rop="203"/> </function> - <function name="MultiTexCoord2iARB" offset="388" - vectorequiv="MultiTexCoord2ivARB" exec="loopback"> + <function name="MultiTexCoord2iARB" + vectorequiv="MultiTexCoord2iv" alias="MultiTexCoord2i"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="MultiTexCoord2ivARB" offset="389" exec="loopback"> + <function name="MultiTexCoord2ivARB" alias="MultiTexCoord2iv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *" count="2"/> - <glx rop="204"/> + <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord2sARB" offset="390" - vectorequiv="MultiTexCoord2svARB" exec="loopback"> + <function name="MultiTexCoord2sARB" + vectorequiv="MultiTexCoord2sv" alias="MultiTexCoord2s"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="MultiTexCoord2svARB" offset="391" exec="loopback"> + <function name="MultiTexCoord2svARB" alias="MultiTexCoord2sv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *" count="2"/> - <glx rop="205"/> + <param name="v" type="const GLshort *"/> </function> - <function name="MultiTexCoord3dARB" offset="392" - vectorequiv="MultiTexCoord3dvARB" exec="loopback"> + <function name="MultiTexCoord3dARB" + vectorequiv="MultiTexCoord3dv" alias="MultiTexCoord3d"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="MultiTexCoord3dvARB" offset="393" exec="loopback"> + <function name="MultiTexCoord3dvARB" alias="MultiTexCoord3dv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *" count="3"/> - <glx rop="206"/> + <param name="v" type="const GLdouble *"/> </function> <function name="MultiTexCoord3fARB" offset="394" @@ -6121,36 +6222,34 @@ <glx rop="207"/> </function> - <function name="MultiTexCoord3iARB" offset="396" - vectorequiv="MultiTexCoord3ivARB" exec="loopback"> + <function name="MultiTexCoord3iARB" + vectorequiv="MultiTexCoord3iv" alias="MultiTexCoord3i"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="MultiTexCoord3ivARB" offset="397" exec="loopback"> + <function name="MultiTexCoord3ivARB" alias="MultiTexCoord3iv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *" count="3"/> - <glx rop="208"/> + <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord3sARB" offset="398" - vectorequiv="MultiTexCoord3svARB" exec="loopback"> + <function name="MultiTexCoord3sARB" + vectorequiv="MultiTexCoord3sv" alias="MultiTexCoord3s"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="MultiTexCoord3svARB" offset="399" exec="loopback"> + <function name="MultiTexCoord3svARB" alias="MultiTexCoord3sv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *" count="3"/> - <glx rop="209"/> + <param name="v" type="const GLshort *"/> </function> - <function name="MultiTexCoord4dARB" offset="400" - vectorequiv="MultiTexCoord4dvARB" exec="loopback"> + <function name="MultiTexCoord4dARB" + vectorequiv="MultiTexCoord4dv" alias="MultiTexCoord4d"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> @@ -6158,10 +6257,9 @@ <param name="q" type="GLdouble"/> </function> - <function name="MultiTexCoord4dvARB" offset="401" exec="loopback"> + <function name="MultiTexCoord4dvARB" alias="MultiTexCoord4dv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *" count="4"/> - <glx rop="210"/> + <param name="v" type="const GLdouble *"/> </function> <function name="MultiTexCoord4fARB" offset="402" @@ -6179,8 +6277,8 @@ <glx rop="211"/> </function> - <function name="MultiTexCoord4iARB" offset="404" - vectorequiv="MultiTexCoord4ivARB" exec="loopback"> + <function name="MultiTexCoord4iARB" + vectorequiv="MultiTexCoord4iv" alias="MultiTexCoord4i"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> @@ -6188,14 +6286,13 @@ <param name="q" type="GLint"/> </function> - <function name="MultiTexCoord4ivARB" offset="405" exec="loopback"> + <function name="MultiTexCoord4ivARB" alias="MultiTexCoord4iv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *" count="4"/> - <glx rop="212"/> + <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord4sARB" offset="406" - vectorequiv="MultiTexCoord4svARB" exec="loopback"> + <function name="MultiTexCoord4sARB" + vectorequiv="MultiTexCoord4sv" alias="MultiTexCoord4s"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> @@ -6203,10 +6300,9 @@ <param name="q" type="GLshort"/> </function> - <function name="MultiTexCoord4svARB" offset="407" exec="loopback"> + <function name="MultiTexCoord4svARB" alias="MultiTexCoord4sv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *" count="4"/> - <glx rop="213"/> + <param name="v" type="const GLshort *"/> </function> </category> @@ -6218,24 +6314,20 @@ <enum name="TRANSPOSE_TEXTURE_MATRIX_ARB" value="0x84E5"/> <enum name="TRANSPOSE_COLOR_MATRIX_ARB" value="0x84E6"/> - <function name="LoadTransposeMatrixfARB" offset="assign"> + <function name="LoadTransposeMatrixfARB" alias="LoadTransposeMatrixf"> <param name="m" type="const GLfloat *"/> - <glx handcode="true"/> </function> - <function name="LoadTransposeMatrixdARB" offset="assign"> + <function name="LoadTransposeMatrixdARB" alias="LoadTransposeMatrixd"> <param name="m" type="const GLdouble *"/> - <glx handcode="true"/> </function> - <function name="MultTransposeMatrixfARB" offset="assign"> + <function name="MultTransposeMatrixfARB" alias="MultTransposeMatrixf"> <param name="m" type="const GLfloat *"/> - <glx handcode="true"/> </function> - <function name="MultTransposeMatrixdARB" offset="assign"> + <function name="MultTransposeMatrixdARB" alias="MultTransposeMatrixd"> <param name="m" type="const GLdouble *"/> - <glx handcode="true"/> </function> </category> @@ -6268,10 +6360,9 @@ </enum> <enum name="MULTISAMPLE_BIT_ARB" value="0x20000000"/> - <function name="SampleCoverageARB" offset="assign"> + <function name="SampleCoverageARB" alias="SampleCoverage"> <param name="value" type="GLclampf"/> <param name="invert" type="GLboolean"/> - <glx rop="229"/> </function> </category> @@ -6328,7 +6419,7 @@ </enum> <enum name="TEXTURE_COMPRESSED_FORMATS_ARB" value="0x86A3"/> - <function name="CompressedTexImage3DARB" offset="assign"> + <function name="CompressedTexImage3DARB" alias="CompressedTexImage3D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -6336,35 +6427,32 @@ <param name="height" type="GLsizei"/> <param name="depth" type="GLsizei"/> <param name="border" type="GLint"/> - <param name="imageSize" type="GLsizei" counter="true"/> - <param name="data" type="const GLvoid *" count="imageSize"/> - <glx rop="216" handcode="client"/> + <param name="imageSize" type="GLsizei"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexImage2DARB" offset="assign"> + <function name="CompressedTexImage2DARB" alias="CompressedTexImage2D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="border" type="GLint"/> - <param name="imageSize" type="GLsizei" counter="true"/> - <param name="data" type="const GLvoid *" count="imageSize"/> - <glx rop="215" handcode="client"/> + <param name="imageSize" type="GLsizei"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexImage1DARB" offset="assign"> + <function name="CompressedTexImage1DARB" alias="CompressedTexImage1D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="border" type="GLint"/> - <param name="imageSize" type="GLsizei" counter="true"/> - <param name="data" type="const GLvoid *" count="imageSize"/> - <glx rop="214" handcode="client"/> + <param name="imageSize" type="GLsizei"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexSubImage3DARB" offset="assign"> + <function name="CompressedTexSubImage3DARB" alias="CompressedTexSubImage3D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -6374,12 +6462,11 @@ <param name="height" type="GLsizei"/> <param name="depth" type="GLsizei"/> <param name="format" type="GLenum"/> - <param name="imageSize" type="GLsizei" counter="true"/> - <param name="data" type="const GLvoid *" count="imageSize"/> - <glx rop="219" handcode="client"/> + <param name="imageSize" type="GLsizei"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexSubImage2DARB" offset="assign"> + <function name="CompressedTexSubImage2DARB" alias="CompressedTexSubImage2D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -6387,33 +6474,30 @@ <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="format" type="GLenum"/> - <param name="imageSize" type="GLsizei" counter="true"/> - <param name="data" type="const GLvoid *" count="imageSize"/> - <glx rop="218" handcode="client"/> + <param name="imageSize" type="GLsizei"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexSubImage1DARB" offset="assign"> + <function name="CompressedTexSubImage1DARB" alias="CompressedTexSubImage1D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> <param name="width" type="GLsizei"/> <param name="format" type="GLenum"/> - <param name="imageSize" type="GLsizei" counter="true"/> - <param name="data" type="const GLvoid *" count="imageSize"/> - <glx rop="217" handcode="client"/> + <param name="imageSize" type="GLsizei"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="GetCompressedTexImageARB" offset="assign"> + <function name="GetCompressedTexImageARB" alias="GetCompressedTexImage"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> - <param name="img" type="GLvoid *" output="true"/> + <param name="img" type="GLvoid *"/> <!-- This has to be hand coded because the image size is in the "wrong" place. Technically, this should be a 'always_array="true"' case. The size field in the reply would be at offset 12. However, the size is actually at offset 16. This is where the 'width' is in a GetTexImage reply. --> - <glx sop="160" handcode="true"/> </function> </category> @@ -6423,25 +6507,25 @@ <category name="GL_ARB_point_parameters" number="14"> <enum name="POINT_SIZE_MIN_ARB" count="1" value="0x8126"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_SIZE_MAX_ARB" count="1" value="0x8127"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_FADE_THRESHOLD_SIZE_ARB" count="1" value="0x8128"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_DISTANCE_ATTENUATION_ARB" count="3" value="0x8129"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> - <function name="PointParameterfARB" alias="PointParameterfEXT"> + <function name="PointParameterfARB" alias="PointParameterf"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="2065"/> </function> - <function name="PointParameterfvARB" alias="PointParameterfvEXT"> + <function name="PointParameterfvARB" alias="PointParameterfv"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="2066"/> @@ -6771,79 +6855,79 @@ </category> <category name="GL_ARB_window_pos" number="25"> - <function name="WindowPos2dARB" alias="WindowPos2dMESA"> + <function name="WindowPos2dARB" alias="WindowPos2d"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="WindowPos2fARB" alias="WindowPos2fMESA"> + <function name="WindowPos2fARB" alias="WindowPos2f"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="WindowPos2iARB" alias="WindowPos2iMESA"> + <function name="WindowPos2iARB" alias="WindowPos2i"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="WindowPos2sARB" alias="WindowPos2sMESA"> + <function name="WindowPos2sARB" alias="WindowPos2s"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="WindowPos2dvARB" alias="WindowPos2dvMESA"> + <function name="WindowPos2dvARB" alias="WindowPos2dv"> <param name="v" type="const GLdouble *"/> </function> - <function name="WindowPos2fvARB" alias="WindowPos2fvMESA"> + <function name="WindowPos2fvARB" alias="WindowPos2fv"> <param name="v" type="const GLfloat *"/> </function> - <function name="WindowPos2ivARB" alias="WindowPos2ivMESA"> + <function name="WindowPos2ivARB" alias="WindowPos2iv"> <param name="v" type="const GLint *"/> </function> - <function name="WindowPos2svARB" alias="WindowPos2svMESA"> + <function name="WindowPos2svARB" alias="WindowPos2sv"> <param name="v" type="const GLshort *"/> </function> - <function name="WindowPos3dARB" alias="WindowPos3dMESA"> + <function name="WindowPos3dARB" alias="WindowPos3d"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="WindowPos3fARB" alias="WindowPos3fMESA"> + <function name="WindowPos3fARB" alias="WindowPos3f"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="WindowPos3iARB" alias="WindowPos3iMESA"> + <function name="WindowPos3iARB" alias="WindowPos3i"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="WindowPos3sARB" alias="WindowPos3sMESA"> + <function name="WindowPos3sARB" alias="WindowPos3s"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="WindowPos3dvARB" alias="WindowPos3dvMESA"> + <function name="WindowPos3dvARB" alias="WindowPos3dv"> <param name="v" type="const GLdouble *"/> </function> - <function name="WindowPos3fvARB" alias="WindowPos3fvMESA"> + <function name="WindowPos3fvARB" alias="WindowPos3fv"> <param name="v" type="const GLfloat *"/> </function> - <function name="WindowPos3ivARB" alias="WindowPos3ivMESA"> + <function name="WindowPos3ivARB" alias="WindowPos3iv"> <param name="v" type="const GLint *"/> </function> - <function name="WindowPos3svARB" alias="WindowPos3svMESA"> + <function name="WindowPos3svARB" alias="WindowPos3sv"> <param name="v" type="const GLshort *"/> </function> </category> @@ -6853,35 +6937,35 @@ <size name="Get" mode="get"/> </enum> <enum name="VERTEX_PROGRAM_ARB" count="1" value="0x8620"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> <size name="Get" mode="get"/> </enum> <enum name="VERTEX_ATTRIB_ARRAY_ENABLED_ARB" count="1" value="0x8622"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> </enum> <enum name="VERTEX_ATTRIB_ARRAY_SIZE_ARB" count="1" value="0x8623"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> </enum> <enum name="VERTEX_ATTRIB_ARRAY_STRIDE_ARB" count="1" value="0x8624"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> </enum> <enum name="VERTEX_ATTRIB_ARRAY_TYPE_ARB" count="1" value="0x8625"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> </enum> <enum name="CURRENT_VERTEX_ATTRIB_ARB" count="1" value="0x8626"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> </enum> <enum name="PROGRAM_LENGTH_ARB" count="1" value="0x8627"> <size name="GetProgramivARB" mode="get"/> @@ -7026,37 +7110,33 @@ <enum name="MATRIX30_ARB" value="0x88DE"/> <enum name="MATRIX31_ARB" value="0x88DF"/> - <function name="GetVertexAttribdvARB" offset="assign"> + <function name="GetVertexAttribdvARB" alias="GetVertexAttribdv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLdouble *" output="true" variable_param="pname"/> - <glx handcode="client" vendorpriv="1301"/> + <param name="params" type="GLdouble *"/> </function> - <function name="GetVertexAttribfvARB" offset="assign"> + <function name="GetVertexAttribfvARB" alias="GetVertexAttribfv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLfloat *" output="true" variable_param="pname"/> - <glx handcode="client" vendorpriv="1302"/> + <param name="params" type="GLfloat *"/> </function> - <function name="GetVertexAttribivARB" offset="assign"> + <function name="GetVertexAttribivARB" alias="GetVertexAttribiv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLint *" output="true" variable_param="pname"/> - <glx handcode="client" vendorpriv="1303"/> + <param name="params" type="GLint *"/> </function> - <function name="VertexAttrib1dARB" offset="assign" - vectorequiv="VertexAttrib1dvARB" exec="loopback"> + <function name="VertexAttrib1dARB" + vectorequiv="VertexAttrib1dv" alias="VertexAttrib1d"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> </function> - <function name="VertexAttrib1dvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib1dvARB" alias="VertexAttrib1dv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *" count="1"/> - <glx rop="4197" doubles_in_order="true"/> + <param name="v" type="const GLdouble *"/> </function> <function name="VertexAttrib1fARB" offset="assign" @@ -7071,29 +7151,27 @@ <glx rop="4193"/> </function> - <function name="VertexAttrib1sARB" offset="assign" - vectorequiv="VertexAttrib1svARB" exec="loopback"> + <function name="VertexAttrib1sARB" + vectorequiv="VertexAttrib1sv" alias="VertexAttrib1s"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> </function> - <function name="VertexAttrib1svARB" offset="assign" exec="loopback"> + <function name="VertexAttrib1svARB" alias="VertexAttrib1sv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *" count="1"/> - <glx rop="4189"/> + <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttrib2dARB" offset="assign" - vectorequiv="VertexAttrib2dvARB" exec="loopback"> + <function name="VertexAttrib2dARB" + vectorequiv="VertexAttrib2dv" alias="VertexAttrib2d"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="VertexAttrib2dvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib2dvARB" alias="VertexAttrib2dv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *" count="2"/> - <glx rop="4198" doubles_in_order="true"/> + <param name="v" type="const GLdouble *"/> </function> <function name="VertexAttrib2fARB" offset="assign" @@ -7109,31 +7187,29 @@ <glx rop="4194"/> </function> - <function name="VertexAttrib2sARB" offset="assign" - vectorequiv="VertexAttrib2svARB" exec="loopback"> + <function name="VertexAttrib2sARB" + vectorequiv="VertexAttrib2sv" alias="VertexAttrib2s"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="VertexAttrib2svARB" offset="assign" exec="loopback"> + <function name="VertexAttrib2svARB" alias="VertexAttrib2sv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *" count="2"/> - <glx rop="4190"/> + <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttrib3dARB" offset="assign" - vectorequiv="VertexAttrib3dvARB" exec="loopback"> + <function name="VertexAttrib3dARB" + vectorequiv="VertexAttrib3dv" alias="VertexAttrib3d"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="VertexAttrib3dvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib3dvARB" alias="VertexAttrib3dv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *" count="3"/> - <glx rop="4199" doubles_in_order="true"/> + <param name="v" type="const GLdouble *"/> </function> <function name="VertexAttrib3fARB" offset="assign" @@ -7150,22 +7226,21 @@ <glx rop="4195"/> </function> - <function name="VertexAttrib3sARB" offset="assign" - vectorequiv="VertexAttrib3svARB" exec="loopback"> + <function name="VertexAttrib3sARB" + vectorequiv="VertexAttrib3sv" alias="VertexAttrib3s"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="VertexAttrib3svARB" offset="assign" exec="loopback"> + <function name="VertexAttrib3svARB" alias="VertexAttrib3sv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *" count="3"/> - <glx rop="4191"/> + <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttrib4dARB" offset="assign" - vectorequiv="VertexAttrib4dvARB" exec="loopback"> + <function name="VertexAttrib4dARB" + vectorequiv="VertexAttrib4dv" alias="VertexAttrib4d"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> @@ -7173,10 +7248,9 @@ <param name="w" type="GLdouble"/> </function> - <function name="VertexAttrib4dvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4dvARB" alias="VertexAttrib4dv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *" count="4"/> - <glx rop="4200" doubles_in_order="true"/> + <param name="v" type="const GLdouble *"/> </function> <function name="VertexAttrib4fARB" offset="assign" @@ -7194,8 +7268,8 @@ <glx rop="4196"/> </function> - <function name="VertexAttrib4sARB" offset="assign" - vectorequiv="VertexAttrib4svARB" exec="loopback"> + <function name="VertexAttrib4sARB" + vectorequiv="VertexAttrib4sv" alias="VertexAttrib4s"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> @@ -7203,14 +7277,13 @@ <param name="w" type="GLshort"/> </function> - <function name="VertexAttrib4svARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4svARB" alias="VertexAttrib4sv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *" count="4"/> - <glx rop="4192"/> + <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttrib4NubARB" offset="assign" - vectorequiv="VertexAttrib4NubvARB" exec="loopback"> + <function name="VertexAttrib4NubARB" + vectorequiv="VertexAttrib4Nubv" alias="VertexAttrib4Nub"> <param name="index" type="GLuint"/> <param name="x" type="GLubyte"/> <param name="y" type="GLubyte"/> @@ -7218,90 +7291,76 @@ <param name="w" type="GLubyte"/> </function> - <function name="VertexAttrib4NubvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4NubvARB" alias="VertexAttrib4Nubv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLubyte *" count="4"/> - <glx rop="4201"/> + <param name="v" type="const GLubyte *"/> </function> - <function name="VertexAttrib4bvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4bvARB" alias="VertexAttrib4bv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLbyte *" count="4"/> - <glx rop="4230"/> + <param name="v" type="const GLbyte *"/> </function> - <function name="VertexAttrib4ivARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4ivARB" alias="VertexAttrib4iv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLint *" count="4"/> - <glx rop="4231"/> + <param name="v" type="const GLint *"/> </function> - <function name="VertexAttrib4ubvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4ubvARB" alias="VertexAttrib4ubv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLubyte *" count="4"/> - <glx rop="4232"/> + <param name="v" type="const GLubyte *"/> </function> - <function name="VertexAttrib4usvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4usvARB" alias="VertexAttrib4usv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLushort *" count="4"/> - <glx rop="4233"/> + <param name="v" type="const GLushort *"/> </function> - <function name="VertexAttrib4uivARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4uivARB" alias="VertexAttrib4uiv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLuint *" count="4"/> - <glx rop="4234"/> + <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttrib4NbvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4NbvARB" alias="VertexAttrib4Nbv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLbyte *" count="4"/> - <glx rop="4235"/> + <param name="v" type="const GLbyte *"/> </function> - <function name="VertexAttrib4NsvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4NsvARB" alias="VertexAttrib4Nsv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *" count="4"/> - <glx rop="4236"/> + <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttrib4NivARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4NivARB" alias="VertexAttrib4Niv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLint *" count="4"/> - <glx rop="4237"/> + <param name="v" type="const GLint *"/> </function> - <function name="VertexAttrib4NusvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4NusvARB" alias="VertexAttrib4Nusv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLushort *" count="4"/> - <glx rop="4238"/> + <param name="v" type="const GLushort *"/> </function> - <function name="VertexAttrib4NuivARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4NuivARB" alias="VertexAttrib4Nuiv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLuint *" count="4"/> - <glx rop="4239"/> + <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribPointerARB" offset="assign"> + <function name="VertexAttribPointerARB" alias="VertexAttribPointer"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> - <glx handcode="true"/> </function> - <function name="EnableVertexAttribArrayARB" offset="assign"> + <function name="EnableVertexAttribArrayARB" alias="EnableVertexAttribArray"> <param name="index" type="GLuint"/> - <glx handcode="true"/> </function> - <function name="DisableVertexAttribArrayARB" offset="assign"> + <function name="DisableVertexAttribArrayARB" alias="DisableVertexAttribArray"> <param name="index" type="GLuint"/> - <glx handcode="true"/> </function> <function name="ProgramStringARB" offset="assign" deprecated="3.1"> @@ -7312,24 +7371,28 @@ <glx rop="4217" large="true"/> </function> - <function name="BindProgramARB" alias="BindProgramNV"> + <function name="BindProgramARB" offset="assign"> <param name="target" type="GLenum"/> <param name="program" type="GLuint"/> + <glx rop="4180"/> </function> - <function name="DeleteProgramsARB" alias="DeleteProgramsNV"> - <param name="n" type="GLsizei"/> - <param name="programs" type="const GLuint *"/> + <function name="DeleteProgramsARB" offset="assign"> + <param name="n" type="GLsizei" counter="true"/> + <param name="programs" type="const GLuint *" count="n"/> + <glx vendorpriv="1294"/> </function> - <function name="GenProgramsARB" alias="GenProgramsNV"> + <function name="GenProgramsARB" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="programs" type="GLuint *" output="true" count="n"/> + <glx vendorpriv="1295" always_array="true"/> </function> - <function name="IsProgramARB" alias="IsProgramNV"> + <function name="IsProgramARB" offset="assign"> <param name="program" type="GLuint"/> <return type="GLboolean"/> + <glx vendorpriv="1304"/> </function> <function name="ProgramEnvParameter4dARB" offset="assign" @@ -7463,7 +7526,7 @@ <glx vendorpriv="1308" handcode="server" always_array="true"/> </function> - <function name="GetVertexAttribPointervARB" alias="GetVertexAttribPointervNV"> + <function name="GetVertexAttribPointervARB" alias="GetVertexAttribPointerv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="pointer" type="GLvoid **" output="true"/> @@ -7520,10 +7583,10 @@ <category name="GL_ARB_vertex_buffer_object" number="28"> <enum name="BUFFER_SIZE_ARB" count="1" value="0x8764"> - <size name="GetBufferParameterivARB" mode="get"/> + <size name="GetBufferParameteriv" mode="get"/> </enum> <enum name="BUFFER_USAGE_ARB" count="1" value="0x8765"> - <size name="GetBufferParameterivARB" mode="get"/> + <size name="GetBufferParameteriv" mode="get"/> </enum> <enum name="ARRAY_BUFFER_BINDING_ARB" count="1" value="0x8894"> <size name="Get" mode="get"/> @@ -7559,18 +7622,18 @@ <size name="Get" mode="get"/> </enum> <enum name="VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB" count="1" value="0x889F"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> </enum> <enum name="READ_ONLY_ARB" value="0x88B8"/> <enum name="WRITE_ONLY_ARB" value="0x88B9"/> <enum name="READ_WRITE_ARB" value="0x88BA"/> <enum name="BUFFER_ACCESS_ARB" count="1" value="0x88BB"> - <size name="GetBufferParameterivARB" mode="get"/> + <size name="GetBufferParameteriv" mode="get"/> </enum> <enum name="BUFFER_MAPPED_ARB" count="1" value="0x88BC"> - <size name="GetBufferParameterivARB" mode="get"/> + <size name="GetBufferParameteriv" mode="get"/> </enum> <enum name="BUFFER_MAP_POINTER_ARB" value="0x88BD"/> <enum name="STREAM_DRAW_ARB" value="0x88E0"/> @@ -7586,147 +7649,128 @@ <type name="intptrARB" size="4" glx_name="CARD32"/> <type name="sizeiptrARB" size="4" unsigned="true" glx_name="CARD32"/> - <function name="BindBufferARB" offset="assign"> + <function name="BindBufferARB" alias="BindBuffer"> <param name="target" type="GLenum"/> <param name="buffer" type="GLuint"/> - <glx ignore="true"/> </function> - <function name="BufferDataARB" offset="assign"> + <function name="BufferDataARB" alias="BufferData"> <param name="target" type="GLenum"/> - <param name="size" type="GLsizeiptrARB" counter="true"/> - <param name="data" type="const GLvoid *" count="size" img_null_flag="true"/> + <param name="size" type="GLsizeiptrARB"/> + <param name="data" type="const GLvoid *"/> <param name="usage" type="GLenum"/> - <glx ignore="true"/> </function> - <function name="BufferSubDataARB" offset="assign"> + <function name="BufferSubDataARB" alias="BufferSubData"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptrARB"/> - <param name="size" type="GLsizeiptrARB" counter="true"/> - <param name="data" type="const GLvoid *" count="size"/> - <glx ignore="true"/> + <param name="size" type="GLsizeiptrARB"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="DeleteBuffersARB" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="buffer" type="const GLuint *" count="n"/> - <glx ignore="true"/> + <function name="DeleteBuffersARB" alias="DeleteBuffers"> + <param name="n" type="GLsizei"/> + <param name="buffer" type="const GLuint *"/> </function> - <function name="GenBuffersARB" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="buffer" type="GLuint *" output="true" count="n"/> - <glx ignore="true"/> + <function name="GenBuffersARB" alias="GenBuffers"> + <param name="n" type="GLsizei"/> + <param name="buffer" type="GLuint *"/> </function> - <function name="GetBufferParameterivARB" offset="assign"> + <function name="GetBufferParameterivARB" alias="GetBufferParameteriv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLint *" output="true" variable_param="pname"/> - <glx ignore="true"/> + <param name="params" type="GLint *"/> </function> - <function name="GetBufferPointervARB" offset="assign"> + <function name="GetBufferPointervARB" alias="GetBufferPointerv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLvoid **" output="true"/> - <glx ignore="true"/> + <param name="params" type="GLvoid **"/> </function> - <function name="GetBufferSubDataARB" offset="assign"> + <function name="GetBufferSubDataARB" alias="GetBufferSubData"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptrARB"/> - <param name="size" type="GLsizeiptrARB" counter="true"/> - <param name="data" type="GLvoid *" output="true" count="size"/> - <glx ignore="true"/> + <param name="size" type="GLsizeiptrARB"/> + <param name="data" type="GLvoid *"/> </function> - <function name="IsBufferARB" offset="assign"> + <function name="IsBufferARB" alias="IsBuffer"> <param name="buffer" type="GLuint"/> <return type="GLboolean"/> - <glx ignore="true"/> </function> - <function name="MapBufferARB" offset="assign"> + <function name="MapBufferARB" alias="MapBuffer"> <param name="target" type="GLenum"/> <param name="access" type="GLenum"/> <return type="GLvoid *"/> - <glx ignore="true"/> </function> - <function name="UnmapBufferARB" offset="assign"> + <function name="UnmapBufferARB" alias="UnmapBuffer"> <param name="target" type="GLenum"/> <return type="GLboolean"/> - <glx ignore="true"/> </function> </category> <category name="GL_ARB_occlusion_query" number="29"> <enum name="QUERY_COUNTER_BITS_ARB" count="1" value="0x8864"> - <size name="GetQueryivARB" mode="get"/> + <size name="GetQueryiv" mode="get"/> </enum> <enum name="CURRENT_QUERY_ARB" count="1" value="0x8865"> - <size name="GetQueryivARB" mode="get"/> + <size name="GetQueryiv" mode="get"/> </enum> <enum name="QUERY_RESULT_ARB" count="1" value="0x8866"> - <size name="GetQueryObjectivARB" mode="get"/> - <size name="GetQueryObjectuivARB" mode="get"/> + <size name="GetQueryObjectiv" mode="get"/> + <size name="GetQueryObjectuiv" mode="get"/> </enum> <enum name="QUERY_RESULT_AVAILABLE_ARB" count="1" value="0x8867"> - <size name="GetQueryObjectivARB" mode="get"/> - <size name="GetQueryObjectuivARB" mode="get"/> + <size name="GetQueryObjectiv" mode="get"/> + <size name="GetQueryObjectuiv" mode="get"/> </enum> <enum name="SAMPLES_PASSED_ARB" value="0x8914"/> - <function name="GenQueriesARB" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="ids" type="GLuint *" output="true" count="n"/> - <glx sop="162" always_array="true"/> + <function name="GenQueriesARB" alias="GenQueries"> + <param name="n" type="GLsizei"/> + <param name="ids" type="GLuint *"/> </function> - <function name="DeleteQueriesARB" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="ids" type="const GLuint *" count="n"/> - <glx sop="161"/> + <function name="DeleteQueriesARB" alias="DeleteQueries"> + <param name="n" type="GLsizei"/> + <param name="ids" type="const GLuint *"/> </function> - <function name="IsQueryARB" offset="assign"> + <function name="IsQueryARB" alias="IsQuery"> <param name="id" type="GLuint"/> <return type="GLboolean"/> - <glx sop="163"/> </function> - <function name="BeginQueryARB" offset="assign"> + <function name="BeginQueryARB" alias="BeginQuery"> <param name="target" type="GLenum"/> <param name="id" type="GLuint"/> - <glx rop="231"/> </function> - <function name="EndQueryARB" offset="assign"> + <function name="EndQueryARB" alias="EndQuery"> <param name="target" type="GLenum"/> - <glx rop="232"/> </function> - <function name="GetQueryivARB" offset="assign"> + <function name="GetQueryivARB" alias="GetQueryiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLint *" output="true" variable_param="pname"/> - <glx sop="164"/> + <param name="params" type="GLint *"/> </function> - <function name="GetQueryObjectivARB" offset="assign"> + <function name="GetQueryObjectivARB" alias="GetQueryObjectiv"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLint *" output="true" variable_param="pname"/> - <glx sop="165"/> + <param name="params" type="GLint *"/> </function> - <function name="GetQueryObjectuivARB" offset="assign"> + <function name="GetQueryObjectuivARB" alias="GetQueryObjectuiv"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLuint *" output="true" variable_param="pname"/> - <glx sop="166"/> + <param name="params" type="GLuint *"/> </function> </category> @@ -7784,17 +7828,15 @@ <glx ignore="true"/> </function> - <function name="ShaderSourceARB" offset="assign"> + <function name="ShaderSourceARB" alias="ShaderSource"> <param name="shader" type="GLhandleARB"/> <param name="count" type="GLsizei"/> <param name="string" type="const GLcharARB **"/> <param name="length" type="const GLint *"/> - <glx ignore="true"/> </function> - <function name="CompileShaderARB" offset="assign"> + <function name="CompileShaderARB" alias="CompileShader"> <param name="shader" type="GLhandleARB"/> - <glx ignore="true"/> </function> <function name="CreateProgramObjectARB" offset="assign"> @@ -7808,159 +7850,137 @@ <glx ignore="true"/> </function> - <function name="LinkProgramARB" offset="assign"> + <function name="LinkProgramARB" alias="LinkProgram"> <param name="program" type="GLhandleARB"/> - <glx ignore="true"/> </function> - <function name="UseProgramObjectARB" offset="assign"> + <function name="UseProgramObjectARB" alias="UseProgram"> <param name="program" type="GLhandleARB"/> - <glx ignore="true"/> </function> - <function name="ValidateProgramARB" offset="assign"> + <function name="ValidateProgramARB" alias="ValidateProgram"> <param name="program" type="GLhandleARB"/> - <glx ignore="true"/> </function> - <function name="Uniform1fARB" offset="assign"> + <function name="Uniform1fARB" alias="Uniform1f"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> - <glx ignore="true"/> </function> - <function name="Uniform2fARB" offset="assign"> + <function name="Uniform2fARB" alias="Uniform2f"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> - <glx ignore="true"/> </function> - <function name="Uniform3fARB" offset="assign"> + <function name="Uniform3fARB" alias="Uniform3f"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> <param name="v2" type="GLfloat"/> - <glx ignore="true"/> </function> - <function name="Uniform4fARB" offset="assign"> + <function name="Uniform4fARB" alias="Uniform4f"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> <param name="v2" type="GLfloat"/> <param name="v3" type="GLfloat"/> - <glx ignore="true"/> </function> - <function name="Uniform1iARB" offset="assign"> + <function name="Uniform1iARB" alias="Uniform1i"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> - <glx ignore="true"/> </function> - <function name="Uniform2iARB" offset="assign"> + <function name="Uniform2iARB" alias="Uniform2i"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> - <glx ignore="true"/> </function> - <function name="Uniform3iARB" offset="assign"> + <function name="Uniform3iARB" alias="Uniform3i"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> <param name="v2" type="GLint"/> - <glx ignore="true"/> </function> - <function name="Uniform4iARB" offset="assign"> + <function name="Uniform4iARB" alias="Uniform4i"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> <param name="v2" type="GLint"/> <param name="v3" type="GLint"/> - <glx ignore="true"/> </function> - <function name="Uniform1fvARB" offset="assign"> + <function name="Uniform1fvARB" alias="Uniform1fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> - <function name="Uniform2fvARB" offset="assign"> + <function name="Uniform2fvARB" alias="Uniform2fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> - <function name="Uniform3fvARB" offset="assign"> + <function name="Uniform3fvARB" alias="Uniform3fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> - <function name="Uniform4fvARB" offset="assign"> + <function name="Uniform4fvARB" alias="Uniform4fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> - <function name="Uniform1ivARB" offset="assign"> + <function name="Uniform1ivARB" alias="Uniform1iv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> - <glx ignore="true"/> </function> - <function name="Uniform2ivARB" offset="assign"> + <function name="Uniform2ivARB" alias="Uniform2iv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> - <glx ignore="true"/> </function> - <function name="Uniform3ivARB" offset="assign"> + <function name="Uniform3ivARB" alias="Uniform3iv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> - <glx ignore="true"/> </function> - <function name="Uniform4ivARB" offset="assign"> + <function name="Uniform4ivARB" alias="Uniform4iv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> - <glx ignore="true"/> </function> - <function name="UniformMatrix2fvARB" offset="assign"> + <function name="UniformMatrix2fvARB" alias="UniformMatrix2fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> - <function name="UniformMatrix3fvARB" offset="assign"> + <function name="UniformMatrix3fvARB" alias="UniformMatrix3fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> - <function name="UniformMatrix4fvARB" offset="assign"> + <function name="UniformMatrix4fvARB" alias="UniformMatrix4fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> <function name="GetObjectParameterfvARB" offset="assign"> @@ -7993,44 +8013,39 @@ <glx ignore="true"/> </function> - <function name="GetUniformLocationARB" offset="assign"> + <function name="GetUniformLocationARB" alias="GetUniformLocation"> <param name="program" type="GLhandleARB"/> <param name="name" type="const GLcharARB *"/> <return type="GLint"/> - <glx ignore="true"/> </function> - <function name="GetActiveUniformARB" offset="assign"> + <function name="GetActiveUniformARB" alias="GetActiveUniform"> <param name="program" type="GLhandleARB"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> - <param name="length" type="GLsizei *" output="true"/> - <param name="size" type="GLint *" output="true"/> - <param name="type" type="GLenum *" output="true"/> - <param name="name" type="GLcharARB *" output="true"/> - <glx ignore="true"/> + <param name="length" type="GLsizei *"/> + <param name="size" type="GLint *"/> + <param name="type" type="GLenum *"/> + <param name="name" type="GLcharARB *"/> </function> - <function name="GetUniformfvARB" offset="assign"> + <function name="GetUniformfvARB" alias="GetUniformfv"> <param name="program" type="GLhandleARB"/> <param name="location" type="GLint"/> - <param name="params" type="GLfloat *" output="true"/> - <glx ignore="true"/> + <param name="params" type="GLfloat *"/> </function> - <function name="GetUniformivARB" offset="assign"> + <function name="GetUniformivARB" alias="GetUniformiv"> <param name="program" type="GLhandleARB"/> <param name="location" type="GLint"/> - <param name="params" type="GLint *" output="true"/> - <glx ignore="true"/> + <param name="params" type="GLint *"/> </function> - <function name="GetShaderSourceARB" offset="assign"> + <function name="GetShaderSourceARB" alias="GetShaderSource"> <param name="shader" type="GLhandleARB"/> <param name="bufSize" type="GLsizei"/> - <param name="length" type="GLsizei *" output="true"/> - <param name="source" type="GLcharARB *" output="true"/> - <glx ignore="true"/> + <param name="length" type="GLsizei *"/> + <param name="source" type="GLcharARB *"/> </function> </category> @@ -8043,29 +8058,26 @@ <enum name="OBJECT_ACTIVE_ATTRIBUTES_ARB" value="0x8B89"/> <enum name="OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB" value="0x8B8A"/> - <function name="BindAttribLocationARB" offset="assign"> + <function name="BindAttribLocationARB" alias="BindAttribLocation"> <param name="program" type="GLhandleARB"/> <param name="index" type="GLuint"/> <param name="name" type="const GLcharARB *"/> - <glx ignore="true"/> </function> - <function name="GetActiveAttribARB" offset="assign"> + <function name="GetActiveAttribARB" alias="GetActiveAttrib"> <param name="program" type="GLhandleARB"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> - <param name="length" type="GLsizei *" output="true"/> - <param name="size" type="GLint *" output="true"/> - <param name="type" type="GLenum *" output="true"/> - <param name="name" type="GLcharARB *" output="true"/> - <glx ignore="true"/> + <param name="length" type="GLsizei *"/> + <param name="size" type="GLint *"/> + <param name="type" type="GLenum *"/> + <param name="name" type="GLcharARB *"/> </function> - <function name="GetAttribLocationARB" offset="assign"> + <function name="GetAttribLocationARB" alias="GetAttribLocation"> <param name="program" type="GLhandleARB"/> <param name="name" type="const GLcharARB *"/> <return type="GLint"/> - <glx ignore="true"/> </function> </category> @@ -8207,12 +8219,12 @@ <enum name="TIMESTAMP" value="0x8E28"/> <type name="int64" size="8"/> <type name="uint64" unsigned="true" size="8"/> - <function name="GetQueryObjecti64v" alias="GetQueryObjecti64vEXT" static_dispatch="false"> + <function name="GetQueryObjecti64v" static_dispatch="false" offset="assign"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint64 *"/> </function> - <function name="GetQueryObjectui64v" alias="GetQueryObjectui64vEXT" static_dispatch="false"> + <function name="GetQueryObjectui64v" static_dispatch="false" offset="assign"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint64 *"/> @@ -9302,28 +9314,26 @@ <category name="GL_EXT_point_parameters" number="54"> <enum name="POINT_SIZE_MIN_EXT" count="1" value="0x8126"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_SIZE_MAX_EXT" count="1" value="0x8127"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_FADE_THRESHOLD_SIZE_EXT" count="1" value="0x8128"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_DISTANCE_ATTENUATION_EXT" count="3" value="0x8129"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> - <function name="PointParameterfEXT" offset="assign" mesa_name="-EXT"> + <function name="PointParameterfEXT" alias="PointParameterf"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> - <glx rop="2065"/> </function> - <function name="PointParameterfvEXT" offset="assign" mesa_name="-EXT"> + <function name="PointParameterfvEXT" alias="PointParameterfv"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfloat *" variable_param="pname"/> - <glx rop="2066"/> + <param name="params" type="const GLfloat *"/> </function> </category> @@ -10028,32 +10038,26 @@ </category> <category name="GL_EXT_secondary_color" number="145"> - <function name="SecondaryColor3bEXT" offset="assign" - vectorequiv="SecondaryColor3bvEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3bEXT" + vectorequiv="SecondaryColor3bv" alias="SecondaryColor3b"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="SecondaryColor3bvEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLbyte *" count="3"/> - <glx rop="4126"/> + <function name="SecondaryColor3bvEXT" alias="SecondaryColor3bv"> + <param name="v" type="const GLbyte *"/> </function> - <function name="SecondaryColor3dEXT" offset="assign" - vectorequiv="SecondaryColor3dvEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3dEXT" + vectorequiv="SecondaryColor3dv" alias="SecondaryColor3d"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="SecondaryColor3dvEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLdouble *" count="3"/> - <glx rop="4130"/> + <function name="SecondaryColor3dvEXT" alias="SecondaryColor3dv"> + <param name="v" type="const GLdouble *"/> </function> <function name="SecondaryColor3fEXT" offset="assign" vectorequiv="SecondaryColor3fvEXT"> @@ -10067,82 +10071,66 @@ <glx rop="4129"/> </function> - <function name="SecondaryColor3iEXT" offset="assign" - vectorequiv="SecondaryColor3ivEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3iEXT" + vectorequiv="SecondaryColor3iv" alias="SecondaryColor3i"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="SecondaryColor3ivEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLint *" count="3"/> - <glx rop="4128"/> + <function name="SecondaryColor3ivEXT" alias="SecondaryColor3iv"> + <param name="v" type="const GLint *"/> </function> - <function name="SecondaryColor3sEXT" offset="assign" - vectorequiv="SecondaryColor3svEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3sEXT" + vectorequiv="SecondaryColor3sv" alias="SecondaryColor3s"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="SecondaryColor3svEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLshort *" count="3"/> - <glx rop="4127"/> + <function name="SecondaryColor3svEXT" alias="SecondaryColor3sv"> + <param name="v" type="const GLshort *"/> </function> - <function name="SecondaryColor3ubEXT" offset="assign" - vectorequiv="SecondaryColor3ubvEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3ubEXT" + vectorequiv="SecondaryColor3ubv" alias="SecondaryColor3ub"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="SecondaryColor3ubvEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLubyte *" count="3"/> - <glx rop="4131"/> + <function name="SecondaryColor3ubvEXT" alias="SecondaryColor3ubv"> + <param name="v" type="const GLubyte *"/> </function> - <function name="SecondaryColor3uiEXT" offset="assign" - vectorequiv="SecondaryColor3uivEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3uiEXT" + vectorequiv="SecondaryColor3uiv" alias="SecondaryColor3ui"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="SecondaryColor3uivEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLuint *" count="3"/> - <glx rop="4133"/> + <function name="SecondaryColor3uivEXT" alias="SecondaryColor3uiv"> + <param name="v" type="const GLuint *"/> </function> - <function name="SecondaryColor3usEXT" offset="assign" - vectorequiv="SecondaryColor3usvEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3usEXT" + vectorequiv="SecondaryColor3usv" alias="SecondaryColor3us"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="SecondaryColor3usvEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLushort *" count="3"/> - <glx rop="4132"/> + <function name="SecondaryColor3usvEXT" alias="SecondaryColor3usv"> + <param name="v" type="const GLushort *"/> </function> - <function name="SecondaryColorPointerEXT" offset="assign"> + <function name="SecondaryColorPointerEXT" alias="SecondaryColorPointer"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> - <glx handcode="true"/> </function> </category> @@ -10153,12 +10141,11 @@ </category> <category name="GL_EXT_multi_draw_arrays" number="148"> - <function name="MultiDrawArraysEXT" offset="assign" es1="1.0" es2="2.0"> + <function name="MultiDrawArraysEXT" es1="1.0" es2="2.0" alias="MultiDrawArrays"> <param name="mode" type="GLenum"/> <param name="first" type="const GLint *"/> <param name="count" type="const GLsizei *"/> <param name="primcount" type="GLsizei"/> - <glx handcode="true"/> </function> <function name="MultiDrawElementsEXT" offset="assign" es1="1.0" es2="2.0" @@ -10183,21 +10170,18 @@ <glx rop="4124"/> </function> - <function name="FogCoorddEXT" offset="assign" vectorequiv="FogCoorddvEXT" - exec="loopback"> + <function name="FogCoorddEXT" vectorequiv="FogCoorddv" alias="FogCoordd"> <param name="coord" type="GLdouble"/> </function> - <function name="FogCoorddvEXT" offset="assign" exec="loopback"> - <param name="coord" type="const GLdouble *" count="1"/> - <glx rop="4125"/> + <function name="FogCoorddvEXT" alias="FogCoorddv"> + <param name="coord" type="const GLdouble *"/> </function> - <function name="FogCoordPointerEXT" offset="assign"> + <function name="FogCoordPointerEXT" alias="FogCoordPointer"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> - <glx handcode="true"/> </function> </category> @@ -10788,12 +10772,11 @@ <!-- Extension number 172 is a WGL extension. --> <category name="GL_EXT_blend_func_separate" number="173"> - <function name="BlendFuncSeparateEXT" offset="assign"> + <function name="BlendFuncSeparateEXT" alias="BlendFuncSeparate"> <param name="sfactorRGB" type="GLenum"/> <param name="dfactorRGB" type="GLenum"/> <param name="sfactorAlpha" type="GLenum"/> <param name="dfactorAlpha" type="GLenum"/> - <glx rop="4134"/> </function> </category> @@ -11040,95 +11023,80 @@ </category> <category name="GL_MESA_window_pos" number="197"> - <function name="WindowPos2dMESA" offset="assign"> + <function name="WindowPos2dMESA" alias="WindowPos2d"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> - <glx handcode="true"/> </function> - <function name="WindowPos2dvMESA" offset="assign"> + <function name="WindowPos2dvMESA" alias="WindowPos2dv"> <param name="v" type="const GLdouble *"/> - <glx handcode="true"/> </function> - <function name="WindowPos2fMESA" offset="assign"> + <function name="WindowPos2fMESA" alias="WindowPos2f"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> - <glx handcode="true"/> </function> - <function name="WindowPos2fvMESA" offset="assign"> + <function name="WindowPos2fvMESA" alias="WindowPos2fv"> <param name="v" type="const GLfloat *"/> - <glx handcode="true"/> </function> - <function name="WindowPos2iMESA" offset="assign"> + <function name="WindowPos2iMESA" alias="WindowPos2i"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> - <glx handcode="true"/> </function> - <function name="WindowPos2ivMESA" offset="assign"> + <function name="WindowPos2ivMESA" alias="WindowPos2iv"> <param name="v" type="const GLint *"/> - <glx handcode="true"/> </function> - <function name="WindowPos2sMESA" offset="assign"> + <function name="WindowPos2sMESA" alias="WindowPos2s"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> - <glx handcode="true"/> </function> - <function name="WindowPos2svMESA" offset="assign"> + <function name="WindowPos2svMESA" alias="WindowPos2sv"> <param name="v" type="const GLshort *"/> - <glx handcode="true"/> </function> - <function name="WindowPos3dMESA" offset="assign"> + <function name="WindowPos3dMESA" alias="WindowPos3d"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> - <glx handcode="true"/> </function> - <function name="WindowPos3dvMESA" offset="assign"> + <function name="WindowPos3dvMESA" alias="WindowPos3dv"> <param name="v" type="const GLdouble *"/> - <glx handcode="true"/> </function> - <function name="WindowPos3fMESA" offset="assign" vectorequiv="WindowPos3fvMESA"> + <function name="WindowPos3fMESA" vectorequiv="WindowPos3fv" alias="WindowPos3f"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="WindowPos3fvMESA" offset="assign"> - <param name="v" type="const GLfloat *" count="3"/> - <glx rop="230"/> + <function name="WindowPos3fvMESA" alias="WindowPos3fv"> + <param name="v" type="const GLfloat *"/> </function> - <function name="WindowPos3iMESA" offset="assign"> + <function name="WindowPos3iMESA" alias="WindowPos3i"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> - <glx handcode="true"/> </function> - <function name="WindowPos3ivMESA" offset="assign"> + <function name="WindowPos3ivMESA" alias="WindowPos3iv"> <param name="v" type="const GLint *"/> - <glx handcode="true"/> </function> - <function name="WindowPos3sMESA" offset="assign"> + <function name="WindowPos3sMESA" alias="WindowPos3s"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> - <glx handcode="true"/> </function> - <function name="WindowPos3svMESA" offset="assign"> + <function name="WindowPos3svMESA" alias="WindowPos3sv"> <param name="v" type="const GLshort *"/> - <glx handcode="true"/> </function> <function name="WindowPos4dMESA" offset="assign" deprecated="3.1"> @@ -11609,18 +11577,14 @@ <glx vendorpriv="1293"/> </function> - <function name="BindProgramNV" offset="assign" deprecated="3.1" - mesa_name="-NV"> + <function name="BindProgramNV" deprecated="3.1" alias="BindProgramARB"> <param name="target" type="GLenum"/> <param name="program" type="GLuint"/> - <glx rop="4180"/> </function> - <function name="DeleteProgramsNV" offset="assign" deprecated="3.1" - mesa_name="-NV"> - <param name="n" type="GLsizei" counter="true"/> - <param name="programs" type="const GLuint *" count="n"/> - <glx vendorpriv="1294"/> + <function name="DeleteProgramsNV" deprecated="3.1" alias="DeleteProgramsARB"> + <param name="n" type="GLsizei"/> + <param name="programs" type="const GLuint *"/> </function> <function name="ExecuteProgramNV" offset="assign" deprecated="3.1" @@ -11631,11 +11595,9 @@ <glx rop="4181"/> </function> - <function name="GenProgramsNV" offset="assign" deprecated="3.1" - mesa_name="-NV"> - <param name="n" type="GLsizei" counter="true"/> - <param name="programs" type="GLuint *" output="true" count="n"/> - <glx vendorpriv="1295" always_array="true"/> + <function name="GenProgramsNV" deprecated="3.1" alias="GenProgramsARB"> + <param name="n" type="GLsizei"/> + <param name="programs" type="GLuint *"/> </function> <!-- This isn't 100% correct. Currently, the only valid value of pname @@ -11711,19 +11673,15 @@ <glx vendorpriv="1303"/> </function> - <function name="GetVertexAttribPointervNV" offset="assign" - mesa_name="-NV+ARB"> + <function name="GetVertexAttribPointervNV" alias="GetVertexAttribPointerv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> - <param name="pointer" type="GLvoid **" output="true"/> - <glx handcode="true"/> + <param name="pointer" type="GLvoid **"/> </function> - <function name="IsProgramNV" offset="assign" deprecated="3.1" - mesa_name="-NV+ARB"> + <function name="IsProgramNV" deprecated="3.1" alias="IsProgramARB"> <param name="program" type="GLuint"/> <return type="GLboolean"/> - <glx vendorpriv="1304"/> </function> <function name="LoadProgramNV" offset="assign" deprecated="3.1" @@ -11810,49 +11768,46 @@ </function> <function name="VertexAttrib1sNV" offset="assign" - vectorequiv="VertexAttrib1svNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib1svNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> </function> - <function name="VertexAttrib1svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib1svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="1"/> <glx rop="4265"/> </function> <function name="VertexAttrib2sNV" offset="assign" - vectorequiv="VertexAttrib2svNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib2svNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="VertexAttrib2svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib2svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="2"/> <glx rop="4266"/> </function> <function name="VertexAttrib3sNV" offset="assign" - vectorequiv="VertexAttrib3svNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib3svNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="VertexAttrib3svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib3svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="3"/> <glx rop="4267"/> </function> <function name="VertexAttrib4sNV" offset="assign" - vectorequiv="VertexAttrib4svNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib4svNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> @@ -11860,8 +11815,7 @@ <param name="w" type="GLshort"/> </function> - <function name="VertexAttrib4svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib4svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="4268"/> @@ -11930,49 +11884,46 @@ </function> <function name="VertexAttrib1dNV" offset="assign" - vectorequiv="VertexAttrib1dvNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib1dvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> </function> - <function name="VertexAttrib1dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib1dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="1"/> <glx rop="4273" doubles_in_order="true"/> </function> <function name="VertexAttrib2dNV" offset="assign" - vectorequiv="VertexAttrib2dvNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib2dvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="VertexAttrib2dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib2dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="2"/> <glx rop="4274" doubles_in_order="true"/> </function> <function name="VertexAttrib3dNV" offset="assign" - vectorequiv="VertexAttrib3dvNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib3dvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="VertexAttrib3dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib3dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="3"/> <glx rop="4275" doubles_in_order="true"/> </function> <function name="VertexAttrib4dNV" offset="assign" - vectorequiv="VertexAttrib4dvNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib4dvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> @@ -11980,16 +11931,14 @@ <param name="w" type="GLdouble"/> </function> - <function name="VertexAttrib4dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib4dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="4"/> <glx rop="4276" doubles_in_order="true"/> </function> <function name="VertexAttrib4ubNV" offset="assign" - vectorequiv="VertexAttrib4ubvNV" deprecated="3.1" - exec="loopback"> + vectorequiv="VertexAttrib4ubvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLubyte"/> <param name="y" type="GLubyte"/> @@ -11997,111 +11946,97 @@ <param name="w" type="GLubyte"/> </function> - <function name="VertexAttrib4ubvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib4ubvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> <glx rop="4277"/> </function> - <function name="VertexAttribs1svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs1svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n"/> <glx rop="4202"/> </function> - <function name="VertexAttribs2svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs2svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="2"/> <glx rop="4203"/> </function> - <function name="VertexAttribs3svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs3svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="3"/> <glx rop="4204"/> </function> - <function name="VertexAttribs4svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs4svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="4"/> <glx rop="4205"/> </function> - <function name="VertexAttribs1fvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs1fvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n"/> <glx rop="4206"/> </function> - <function name="VertexAttribs2fvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs2fvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="2"/> <glx rop="4207"/> </function> - <function name="VertexAttribs3fvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs3fvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="3"/> <glx rop="4208"/> </function> - <function name="VertexAttribs4fvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs4fvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="4"/> <glx rop="4209"/> </function> - <function name="VertexAttribs1dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs1dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n"/> <glx rop="4210" doubles_in_order="true"/> </function> - <function name="VertexAttribs2dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs2dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="2"/> <glx rop="4211" doubles_in_order="true"/> </function> - <function name="VertexAttribs3dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs3dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="3"/> <glx rop="4212" doubles_in_order="true"/> </function> - <function name="VertexAttribs4dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs4dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="4"/> <glx rop="4213" doubles_in_order="true"/> </function> - <function name="VertexAttribs4ubvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs4ubvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLubyte *" count="n" count_scale="4"/> @@ -12471,16 +12406,16 @@ added for this extension. --> <enum name="POINT_SIZE_MIN_EXT" count="1" value="0x8126"> - <size name="PointParameterivNV"/> + <size name="PointParameteriv"/> </enum> <enum name="POINT_SIZE_MAX_EXT" count="1" value="0x8127"> - <size name="PointParameterivNV"/> + <size name="PointParameteriv"/> </enum> <enum name="POINT_FADE_THRESHOLD_SIZE_EXT" count="1" value="0x8128"> - <size name="PointParameterivNV"/> + <size name="PointParameteriv"/> </enum> <enum name="POINT_DISTANCE_ATTENUATION_EXT" count="3" value="0x8129"> - <size name="PointParameterivNV"/> + <size name="PointParameteriv"/> </enum> <enum name="POINT_SPRITE_NV" count="1" value="0x8861"> @@ -12493,21 +12428,19 @@ <size name="GetTexEnviv" mode="get"/> </enum> <enum name="POINT_SPRITE_R_MODE_NV" count="1" value="0x8863"> - <size name="PointParameterfvEXT"/> - <size name="PointParameterivNV"/> + <size name="PointParameterfv"/> + <size name="PointParameteriv"/> <size name="Get" mode="get"/> </enum> - <function name="PointParameteriNV" offset="assign" mesa_name="-NV"> + <function name="PointParameteriNV" alias="PointParameteri"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> - <glx rop="4221"/> </function> - <function name="PointParameterivNV" offset="assign" mesa_name="-NV"> + <function name="PointParameterivNV" alias="PointParameteriv"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *" variable_param="pname"/> - <glx rop="4222"/> + <param name="params" type="const GLint *"/> </function> </category> @@ -12684,10 +12617,9 @@ <size name="Get" mode="get"/> </enum> - <function name="BlendEquationSeparateEXT" offset="assign" static_dispatch="false"> + <function name="BlendEquationSeparateEXT" static_dispatch="false" alias="BlendEquationSeparate"> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> - <glx rop="4228"/> </function> </category> @@ -12846,7 +12778,7 @@ <!-- Unnumbered extensions sorted by name. --> <category name="GL_ATI_blend_equation_separate"> - <function name="BlendEquationSeparateATI" alias="BlendEquationSeparateEXT" static_dispatch="false"> + <function name="BlendEquationSeparateATI" alias="BlendEquationSeparate" static_dispatch="false"> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> </function> @@ -12904,12 +12836,12 @@ <enum name="TIME_ELAPSED_EXT" value="0x88BF"/> <type name="int64EXT" size="8"/> <type name="uint64EXT" unsigned="true" size="8"/> - <function name="GetQueryObjecti64vEXT" offset="assign" static_dispatch="false"> + <function name="GetQueryObjecti64vEXT" static_dispatch="false" alias="GetQueryObjecti64v"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint64EXT *"/> </function> - <function name="GetQueryObjectui64vEXT" offset="assign" static_dispatch="false"> + <function name="GetQueryObjectui64vEXT" static_dispatch="false" alias="GetQueryObjectui64v"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint64EXT *"/> @@ -12917,7 +12849,7 @@ </category> <category name="GL_INGR_blend_func_separate"> - <function name="BlendFuncSeparateINGR" alias="BlendFuncSeparateEXT" static_dispatch="false"> + <function name="BlendFuncSeparateINGR" alias="BlendFuncSeparate" static_dispatch="false"> <param name="sfactorRGB" type="GLenum"/> <param name="dfactorRGB" type="GLenum"/> <param name="sfactorAlpha" type="GLenum"/> @@ -12965,24 +12897,24 @@ <category name="GL_SGIS_point_parameters"> <enum name="POINT_SIZE_MIN_SGIS" count="1" value="0x8126"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_SIZE_MAX_SGIS" count="1" value="0x8127"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_FADE_THRESHOLD_SIZE_SGIS" count="1" value="0x8128"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_DISTANCE_ATTENUATION_SGIS" count="3" value="0x8129"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> - <function name="PointParameterfSGIS" alias="PointParameterfEXT" static_dispatch="false"> + <function name="PointParameterfSGIS" alias="PointParameterf" static_dispatch="false"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> </function> - <function name="PointParameterfvSGIS" alias="PointParameterfvEXT" static_dispatch="false"> + <function name="PointParameterfvSGIS" alias="PointParameterfv" static_dispatch="false"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> </function> diff --git a/src/mapi/glapi/gen/gl_and_es_API.xml b/src/mapi/glapi/gen/gl_and_es_API.xml index 205f74fa97e..18b0eb4ec89 100644 --- a/src/mapi/glapi/gen/gl_and_es_API.xml +++ b/src/mapi/glapi/gen/gl_and_es_API.xml @@ -18,53 +18,53 @@ <type name="fixed" size="4" /> <type name="clampx" size="4" /> - <function name="AlphaFuncx" alias="AlphaFuncxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="AlphaFuncx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampx"/> </function> - <function name="ClearColorx" alias="ClearColorxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="ClearColorx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="red" type="GLclampx"/> <param name="green" type="GLclampx"/> <param name="blue" type="GLclampx"/> <param name="alpha" type="GLclampx"/> </function> - <function name="ClearDepthx" alias="ClearDepthxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="ClearDepthx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="depth" type="GLclampx"/> </function> - <function name="Color4x" alias="Color4xOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Color4x" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="red" type="GLfixed"/> <param name="green" type="GLfixed"/> <param name="blue" type="GLfixed"/> <param name="alpha" type="GLfixed"/> </function> - <function name="DepthRangex" alias="DepthRangexOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="DepthRangex" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="zNear" type="GLclampx"/> <param name="zFar" type="GLclampx"/> </function> - <function name="Fogx" alias="FogxOES" static_dispatch="false" es1="1.0" - desktop="false"> + <function name="Fogx" static_dispatch="false" es1="1.0" + desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Fogxv" alias="FogxvOES" static_dispatch="false" es1="1.0" - desktop="false"> + <function name="Fogxv" static_dispatch="false" es1="1.0" + desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="Frustumx" alias="FrustumxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Frustumx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -73,63 +73,63 @@ <param name="zFar" type="GLfixed"/> </function> - <function name="LightModelx" alias="LightModelxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="LightModelx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="LightModelxv" alias="LightModelxvOES" - static_dispatch="false" es1="1.0" desktop="false"> + <function name="LightModelxv" + static_dispatch="false" es1="1.0" desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="Lightx" alias="LightxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Lightx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Lightxv" alias="LightxvOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Lightxv" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="LineWidthx" alias="LineWidthxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="LineWidthx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="width" type="GLfixed"/> </function> - <function name="LoadMatrixx" alias="LoadMatrixxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="LoadMatrixx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="m" type="const GLfixed *" count="16"/> </function> - <function name="Materialx" alias="MaterialxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Materialx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Materialxv" alias="MaterialxvOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Materialxv" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="MultMatrixx" alias="MultMatrixxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="MultMatrixx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="m" type="const GLfixed *" count="16"/> </function> - <function name="MultiTexCoord4x" alias="MultiTexCoord4xOES" - static_dispatch="false" es1="1.0" desktop="false"> + <function name="MultiTexCoord4x" + static_dispatch="false" es1="1.0" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="s" type="GLfixed"/> <param name="t" type="GLfixed"/> @@ -137,15 +137,15 @@ <param name="q" type="GLfixed"/> </function> - <function name="Normal3x" alias="Normal3xOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Normal3x" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="nx" type="GLfixed"/> <param name="ny" type="GLfixed"/> <param name="nz" type="GLfixed"/> </function> - <function name="Orthox" alias="OrthoxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Orthox" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -154,69 +154,69 @@ <param name="zFar" type="GLfixed"/> </function> - <function name="PointSizex" alias="PointSizexOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="PointSizex" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="size" type="GLfixed"/> </function> - <function name="PolygonOffsetx" alias="PolygonOffsetxOES" - static_dispatch="false" es1="1.0" desktop="false"> + <function name="PolygonOffsetx" + static_dispatch="false" es1="1.0" desktop="false" offset="assign"> <param name="factor" type="GLfixed"/> <param name="units" type="GLfixed"/> </function> - <function name="Rotatex" alias="RotatexOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Rotatex" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="angle" type="GLfixed"/> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> - <function name="SampleCoveragex" alias="SampleCoveragexOES" - static_dispatch="false" es1="1.0" desktop="false"> + <function name="SampleCoveragex" + static_dispatch="false" es1="1.0" desktop="false" offset="assign"> <param name="value" type="GLclampx"/> <param name="invert" type="GLboolean"/> </function> - <function name="Scalex" alias="ScalexOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Scalex" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> - <function name="TexEnvx" alias="TexEnvxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="TexEnvx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="TexEnvxv" alias="TexEnvxvOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="TexEnvxv" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="TexParameterx" alias="TexParameterxOES" - static_dispatch="false" es1="1.0" desktop="false"> + <function name="TexParameterx" + static_dispatch="false" es1="1.0" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Translatex" alias="TranslatexOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Translatex" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> <!-- from GL_OES_single_precision --> - <function name="Frustumf" alias="FrustumfOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Frustumf" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -225,8 +225,8 @@ <param name="zFar" type="GLfloat"/> </function> - <function name="Orthof" alias="OrthofOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Orthof" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -238,80 +238,80 @@ <category name="es1.1"> <!-- from GL_OES_fixed_point --> - <function name="ClipPlanex" alias="ClipPlanexOES" static_dispatch="false" - es1="1.1" desktop="false"> + <function name="ClipPlanex" static_dispatch="false" + es1="1.1" desktop="false" offset="assign"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfixed *" count="4"/> </function> - <function name="GetClipPlanex" alias="GetClipPlanexOES" - static_dispatch="false" es1="1.1"> + <function name="GetClipPlanex" + static_dispatch="false" es1="1.1" offset="assign"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfixed *" output="true" count="4"/> </function> - <function name="GetFixedv" alias="GetFixedvOES" static_dispatch="false" - es1="1.1" desktop="false"> + <function name="GetFixedv" static_dispatch="false" + es1="1.1" desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetLightxv" alias="GetLightxvOES" static_dispatch="false" - es1="1.1" desktop="false"> + <function name="GetLightxv" static_dispatch="false" + es1="1.1" desktop="false" offset="assign"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetMaterialxv" alias="GetMaterialxvOES" - static_dispatch="false" es1="1.1" desktop="false"> + <function name="GetMaterialxv" + static_dispatch="false" es1="1.1" desktop="false" offset="assign"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetTexEnvxv" alias="GetTexEnvxvOES" static_dispatch="false" - es1="1.1" desktop="false"> + <function name="GetTexEnvxv" static_dispatch="false" + es1="1.1" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetTexParameterxv" alias="GetTexParameterxvOES" - static_dispatch="false" es1="1.1" desktop="false"> + <function name="GetTexParameterxv" + static_dispatch="false" es1="1.1" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="PointParameterx" alias="PointParameterxOES" - static_dispatch="false" es1="1.1" desktop="false"> + <function name="PointParameterx" + static_dispatch="false" es1="1.1" desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="PointParameterxv" alias="PointParameterxvOES" - static_dispatch="false" es1="1.1" desktop="false"> + <function name="PointParameterxv" + static_dispatch="false" es1="1.1" desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *"/> </function> - <function name="TexParameterxv" alias="TexParameterxvOES" - static_dispatch="false" es1="1.1" desktop="false"> + <function name="TexParameterxv" + static_dispatch="false" es1="1.1" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <!-- from GL_OES_single_precision --> - <function name="ClipPlanef" alias="ClipPlanefOES" static_dispatch="false" - es1="1.1" desktop="false"> + <function name="ClipPlanef" static_dispatch="false" + es1="1.1" desktop="false" offset="assign"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfloat *" count="4"/> </function> - <function name="GetClipPlanef" alias="GetClipPlanefOES" - static_dispatch="false" es1="1.1"> + <function name="GetClipPlanef" + static_dispatch="false" es1="1.1" offset="assign"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfloat *" output="true" count="4"/> </function> diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 1f2a8a696ae..417dbd041e1 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -356,8 +356,8 @@ compile_shader_with_debug(struct gl_context *ctx, GLenum target, const GLcharARB GLchar *info; shader = _mesa_CreateShaderObjectARB(target); - _mesa_ShaderSourceARB(shader, 1, &source, NULL); - _mesa_CompileShaderARB(shader); + _mesa_ShaderSource(shader, 1, &source, NULL); + _mesa_CompileShader(shader); _mesa_GetShaderiv(shader, GL_COMPILE_STATUS, &ok); if (ok) @@ -393,7 +393,7 @@ link_program_with_debug(struct gl_context *ctx, GLuint program) GLint ok, size; GLchar *info; - _mesa_LinkProgramARB(program); + _mesa_LinkProgram(program); _mesa_GetProgramiv(program, GL_LINK_STATUS, &ok); if (ok) @@ -604,7 +604,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) _mesa_reference_shader_program(ctx, &save->ActiveShader, ctx->Shader.ActiveProgram); - _mesa_UseProgramObjectARB(0); + _mesa_UseProgram(0); } } @@ -629,7 +629,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) save->TexGenEnabled[u] = ctx->Texture.Unit[u].TexGenEnabled; if (ctx->Texture.Unit[u].Enabled || ctx->Texture.Unit[u].TexGenEnabled) { - _mesa_ActiveTextureARB(GL_TEXTURE0 + u); + _mesa_ActiveTexture(GL_TEXTURE0 + u); _mesa_set_enable(ctx, GL_TEXTURE_2D, GL_FALSE); if (ctx->Extensions.ARB_texture_cube_map) _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE); @@ -659,8 +659,8 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) } /* set defaults for unit[0] */ - _mesa_ActiveTextureARB(GL_TEXTURE0); - _mesa_ClientActiveTextureARB(GL_TEXTURE0); + _mesa_ActiveTexture(GL_TEXTURE0); + _mesa_ClientActiveTexture(GL_TEXTURE0); if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES) { _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); } @@ -676,10 +676,10 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) 16 * sizeof(GLfloat)); save->MatrixMode = ctx->Transform.MatrixMode; /* set 1:1 vertex:pixel coordinate transform */ - _mesa_ActiveTextureARB(GL_TEXTURE0); + _mesa_ActiveTexture(GL_TEXTURE0); _mesa_MatrixMode(GL_TEXTURE); _mesa_LoadIdentity(); - _mesa_ActiveTextureARB(GL_TEXTURE0 + activeTexture); + _mesa_ActiveTexture(GL_TEXTURE0 + activeTexture); _mesa_MatrixMode(GL_MODELVIEW); _mesa_LoadIdentity(); _mesa_MatrixMode(GL_PROJECTION); @@ -737,7 +737,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) * regardless of the internal implementation of the metaops. */ if (ctx->Color.ClampFragmentColor != GL_TRUE) - _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE); + _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE); } if (state & MESA_META_CLAMP_VERTEX_COLOR) { @@ -746,7 +746,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) /* Generally in here we never want vertex color clamping -- * result clamping is only dependent on fragment clamping. */ - _mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR, GL_FALSE); + _mesa_ClampColor(GL_CLAMP_VERTEX_COLOR, GL_FALSE); } if (state & MESA_META_CONDITIONAL_RENDER) { @@ -832,7 +832,7 @@ _mesa_meta_end(struct gl_context *ctx) save->ColorMask[i][2], save->ColorMask[i][3]); } else { - _mesa_ColorMaskIndexed(i, + _mesa_ColorMaski(i, save->ColorMask[i][0], save->ColorMask[i][1], save->ColorMask[i][2], @@ -1001,16 +1001,16 @@ _mesa_meta_end(struct gl_context *ctx) } /* restore current unit state */ - _mesa_ActiveTextureARB(GL_TEXTURE0 + save->ActiveUnit); - _mesa_ClientActiveTextureARB(GL_TEXTURE0 + save->ClientActiveUnit); + _mesa_ActiveTexture(GL_TEXTURE0 + save->ActiveUnit); + _mesa_ClientActiveTexture(GL_TEXTURE0 + save->ClientActiveUnit); } if (state & MESA_META_TRANSFORM) { GLuint activeTexture = ctx->Texture.CurrentUnit; - _mesa_ActiveTextureARB(GL_TEXTURE0); + _mesa_ActiveTexture(GL_TEXTURE0); _mesa_MatrixMode(GL_TEXTURE); _mesa_LoadMatrixf(save->TextureMatrix); - _mesa_ActiveTextureARB(GL_TEXTURE0 + activeTexture); + _mesa_ActiveTexture(GL_TEXTURE0 + activeTexture); _mesa_MatrixMode(GL_MODELVIEW); _mesa_LoadMatrixf(save->ModelviewMatrix); @@ -1034,7 +1034,7 @@ _mesa_meta_end(struct gl_context *ctx) if (state & MESA_META_VERTEX) { /* restore vertex buffer object */ - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, save->ArrayBufferObj->Name); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, save->ArrayBufferObj->Name); _mesa_reference_buffer_object(ctx, &save->ArrayBufferObj, NULL); /* restore vertex array object */ @@ -1054,11 +1054,11 @@ _mesa_meta_end(struct gl_context *ctx) } if (state & MESA_META_CLAMP_FRAGMENT_COLOR) { - _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, save->ClampFragmentColor); + _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, save->ClampFragmentColor); } if (state & MESA_META_CLAMP_VERTEX_COLOR) { - _mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR, save->ClampVertexColor); + _mesa_ClampColor(GL_CLAMP_VERTEX_COLOR, save->ClampVertexColor); } if (state & MESA_META_CONDITIONAL_RENDER) { @@ -1326,12 +1326,12 @@ setup_drawpix_texture(struct gl_context *ctx, _mesa_reference_buffer_object(ctx, &save_unpack_obj, ctx->Unpack.BufferObj); - _mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0); + _mesa_BindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0); /* create empty texture */ _mesa_TexImage2D(tex->Target, 0, tex->IntFormat, tex->Width, tex->Height, 0, format, type, NULL); if (save_unpack_obj != NULL) - _mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, + _mesa_BindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, save_unpack_obj->Name); /* load image */ _mesa_TexSubImage2D(tex->Target, 0, @@ -1372,8 +1372,8 @@ init_blit_depth_pixels(struct gl_context *ctx) texTarget = "2D"; _mesa_snprintf(program2, sizeof(program2), program, texTarget); - _mesa_GenPrograms(1, &blit->DepthFP); - _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP); + _mesa_GenProgramsARB(1, &blit->DepthFP); + _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP); _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(program2), (const GLubyte *) program2); } @@ -1498,7 +1498,7 @@ blitframebuffer_texture(struct gl_context *ctx, verts[3].s = s0; verts[3].t = t1; - _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); } _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); @@ -1583,9 +1583,9 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, _mesa_BindVertexArray(blit->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &blit->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, blit->VBO); - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_GenBuffers(1, &blit->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, blit->VBO); + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), NULL, GL_DYNAMIC_DRAW_ARB); /* setup vertex arrays */ @@ -1596,7 +1596,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, } else { _mesa_BindVertexArray(blit->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, blit->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, blit->VBO); } /* Try faster, direct texture approach first */ @@ -1634,7 +1634,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, verts[3].t = tex->Ttop; /* upload new vertex data */ - _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); } _mesa_set_enable(ctx, tex->Target, GL_TRUE); @@ -1661,7 +1661,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, setup_drawpix_texture(ctx, tex, newTex, GL_DEPTH_COMPONENT, srcW, srcH, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp); - _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP); + _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP); _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE); _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); _mesa_set_enable(ctx, GL_DEPTH_TEST, GL_TRUE); @@ -1693,13 +1693,13 @@ static void meta_glsl_blit_cleanup(struct gl_context *ctx, struct blit_state *blit) { if (blit->ArrayObj) { - _mesa_DeleteVertexArraysAPPLE(1, &blit->ArrayObj); + _mesa_DeleteVertexArrays(1, &blit->ArrayObj); blit->ArrayObj = 0; - _mesa_DeleteBuffersARB(1, &blit->VBO); + _mesa_DeleteBuffers(1, &blit->VBO); blit->VBO = 0; } if (blit->DepthFP) { - _mesa_DeletePrograms(1, &blit->DepthFP); + _mesa_DeleteProgramsARB(1, &blit->DepthFP); blit->DepthFP = 0; } } @@ -1739,8 +1739,8 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers) _mesa_BindVertexArray(clear->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &clear->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO); + _mesa_GenBuffers(1, &clear->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO); /* setup vertex arrays */ _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x)); @@ -1750,7 +1750,7 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers) } else { _mesa_BindVertexArray(clear->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO); } /* GL_COLOR_BUFFER_BIT */ @@ -1758,7 +1758,7 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers) /* leave colormask, glDrawBuffer state as-is */ /* Clears never have the color clamped. */ - _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE); + _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE); } else { ASSERT(metaSave & MESA_META_COLOR_MASK); @@ -1819,7 +1819,7 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers) } /* upload new vertex data */ - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, GL_DYNAMIC_DRAW_ARB); } @@ -1870,30 +1870,30 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear) _mesa_BindVertexArray(clear->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &clear->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO); + _mesa_GenBuffers(1, &clear->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO); /* setup vertex arrays */ - _mesa_VertexAttribPointerARB(0, 3, GL_FLOAT, GL_FALSE, 0, (void *)0); - _mesa_EnableVertexAttribArrayARB(0); + _mesa_VertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, (void *)0); + _mesa_EnableVertexAttribArray(0); vs = _mesa_CreateShaderObjectARB(GL_VERTEX_SHADER); - _mesa_ShaderSourceARB(vs, 1, &vs_source, NULL); - _mesa_CompileShaderARB(vs); + _mesa_ShaderSource(vs, 1, &vs_source, NULL); + _mesa_CompileShader(vs); fs = _mesa_CreateShaderObjectARB(GL_FRAGMENT_SHADER); - _mesa_ShaderSourceARB(fs, 1, &fs_source, NULL); - _mesa_CompileShaderARB(fs); + _mesa_ShaderSource(fs, 1, &fs_source, NULL); + _mesa_CompileShader(fs); clear->ShaderProg = _mesa_CreateProgramObjectARB(); _mesa_AttachShader(clear->ShaderProg, fs); _mesa_DeleteObjectARB(fs); _mesa_AttachShader(clear->ShaderProg, vs); _mesa_DeleteObjectARB(vs); - _mesa_BindAttribLocationARB(clear->ShaderProg, 0, "position"); - _mesa_LinkProgramARB(clear->ShaderProg); + _mesa_BindAttribLocation(clear->ShaderProg, 0, "position"); + _mesa_LinkProgram(clear->ShaderProg); - clear->ColorLocation = _mesa_GetUniformLocationARB(clear->ShaderProg, + clear->ColorLocation = _mesa_GetUniformLocation(clear->ShaderProg, "color"); if (_mesa_is_desktop_gl(ctx) && ctx->Const.GLSLVersion >= 130) { @@ -1905,7 +1905,7 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear) _mesa_DeleteObjectARB(fs); _mesa_AttachShader(clear->IntegerShaderProg, vs); _mesa_DeleteObjectARB(vs); - _mesa_BindAttribLocationARB(clear->IntegerShaderProg, 0, "position"); + _mesa_BindAttribLocation(clear->IntegerShaderProg, 0, "position"); /* Note that user-defined out attributes get automatically assigned * locations starting from 0, so we don't need to explicitly @@ -1915,7 +1915,7 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear) link_program_with_debug(ctx, clear->IntegerShaderProg); clear->IntegerColorLocation = - _mesa_GetUniformLocationARB(clear->IntegerShaderProg, "color"); + _mesa_GetUniformLocation(clear->IntegerShaderProg, "color"); } } @@ -1924,9 +1924,9 @@ meta_glsl_clear_cleanup(struct gl_context *ctx, struct clear_state *clear) { if (clear->ArrayObj == 0) return; - _mesa_DeleteVertexArraysAPPLE(1, &clear->ArrayObj); + _mesa_DeleteVertexArrays(1, &clear->ArrayObj); clear->ArrayObj = 0; - _mesa_DeleteBuffersARB(1, &clear->VBO); + _mesa_DeleteBuffers(1, &clear->VBO); clear->VBO = 0; _mesa_DeleteObjectARB(clear->ShaderProg); clear->ShaderProg = 0; @@ -1980,24 +1980,24 @@ _mesa_meta_glsl_Clear(struct gl_context *ctx, GLbitfield buffers) meta_glsl_clear_init(ctx, clear); if (fb->_IntegerColor) { - _mesa_UseProgramObjectARB(clear->IntegerShaderProg); - _mesa_Uniform4ivARB(clear->IntegerColorLocation, 1, + _mesa_UseProgram(clear->IntegerShaderProg); + _mesa_Uniform4iv(clear->IntegerColorLocation, 1, ctx->Color.ClearColor.i); } else { - _mesa_UseProgramObjectARB(clear->ShaderProg); - _mesa_Uniform4fvARB(clear->ColorLocation, 1, + _mesa_UseProgram(clear->ShaderProg); + _mesa_Uniform4fv(clear->ColorLocation, 1, ctx->Color.ClearColor.f); } _mesa_BindVertexArray(clear->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO); /* GL_COLOR_BUFFER_BIT */ if (buffers & BUFFER_BITS_COLOR) { /* leave colormask, glDrawBuffer state as-is */ /* Clears never have the color clamped. */ - _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE); + _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE); } else { ASSERT(metaSave & MESA_META_COLOR_MASK); @@ -2042,7 +2042,7 @@ _mesa_meta_glsl_Clear(struct gl_context *ctx, GLbitfield buffers) verts[3].z = z; /* upload new vertex data */ - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, GL_DYNAMIC_DRAW_ARB); /* draw quad */ @@ -2098,9 +2098,9 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY, _mesa_BindVertexArray(copypix->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, ©pix->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, copypix->VBO); - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_GenBuffers(1, ©pix->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, copypix->VBO); + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), NULL, GL_DYNAMIC_DRAW_ARB); /* setup vertex arrays */ @@ -2111,7 +2111,7 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY, } else { _mesa_BindVertexArray(copypix->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, copypix->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, copypix->VBO); } newTex = alloc_texture(tex, width, height, intFormat); @@ -2146,7 +2146,7 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY, verts[3].t = tex->Ttop; /* upload new vertex data */ - _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); } /* Alloc/setup texture */ @@ -2260,8 +2260,8 @@ init_draw_stencil_pixels(struct gl_context *ctx) texTarget = "2D"; _mesa_snprintf(program2, sizeof(program2), program, texTarget); - _mesa_GenPrograms(1, &drawpix->StencilFP); - _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP); + _mesa_GenProgramsARB(1, &drawpix->StencilFP); + _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP); _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(program2), (const GLubyte *) program2); } @@ -2294,8 +2294,8 @@ init_draw_depth_pixels(struct gl_context *ctx) texTarget = "2D"; _mesa_snprintf(program2, sizeof(program2), program, texTarget); - _mesa_GenPrograms(1, &drawpix->DepthFP); - _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP); + _mesa_GenProgramsARB(1, &drawpix->DepthFP); + _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP); _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(program2), (const GLubyte *) program2); } @@ -2452,9 +2452,9 @@ _mesa_meta_DrawPixels(struct gl_context *ctx, _mesa_BindVertexArray(drawpix->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &vbo); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, vbo); - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_GenBuffers(1, &vbo); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, vbo); + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, GL_DYNAMIC_DRAW_ARB); /* setup vertex arrays */ @@ -2490,7 +2490,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx, /* set stencil bits to 1 where needed */ _mesa_StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE); - _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP); + _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP); _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE); for (bit = 0; bit < ctx->DrawBuffer->Visual.stencilBits; bit++) { @@ -2511,7 +2511,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx, if (!drawpix->DepthFP) init_draw_depth_pixels(ctx); - _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP); + _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP); _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE); /* polygon color = current raster color */ @@ -2532,7 +2532,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx, _mesa_set_enable(ctx, tex->Target, GL_FALSE); - _mesa_DeleteBuffersARB(1, &vbo); + _mesa_DeleteBuffers(1, &vbo); /* restore unpack params */ ctx->Unpack = unpackSave; @@ -2629,9 +2629,9 @@ _mesa_meta_Bitmap(struct gl_context *ctx, _mesa_BindVertexArrayAPPLE(bitmap->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &bitmap->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, bitmap->VBO); - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_GenBuffers(1, &bitmap->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, bitmap->VBO); + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), NULL, GL_DYNAMIC_DRAW_ARB); /* setup vertex arrays */ @@ -2644,7 +2644,7 @@ _mesa_meta_Bitmap(struct gl_context *ctx, } else { _mesa_BindVertexArray(bitmap->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, bitmap->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, bitmap->VBO); } newTex = alloc_texture(tex, width, height, texIntFormat); @@ -2687,7 +2687,7 @@ _mesa_meta_Bitmap(struct gl_context *ctx, } /* upload new vertex data */ - _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); } /* choose different foreground/background alpha values */ @@ -2770,11 +2770,11 @@ _mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target, * Test that we can actually render in the texture's format. */ if (!mipmap->FBO) - _mesa_GenFramebuffersEXT(1, &mipmap->FBO); - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO); + _mesa_GenFramebuffers(1, &mipmap->FBO); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO); if (target == GL_TEXTURE_1D) { - _mesa_FramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT, + _mesa_FramebufferTexture1D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, target, texObj->Name, srcLevel); } @@ -2782,21 +2782,21 @@ _mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target, /* other work is needed to enable 3D mipmap generation */ else if (target == GL_TEXTURE_3D) { GLint zoffset = 0; - _mesa_FramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT, + _mesa_FramebufferTexture3D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, target, texObj->Name, srcLevel, zoffset); } #endif else { /* 2D / cube */ - _mesa_FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, + _mesa_FramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, target, texObj->Name, srcLevel); } - status = _mesa_CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); + status = _mesa_CheckFramebufferStatus(GL_FRAMEBUFFER_EXT); - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboSave); if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { return GL_TRUE; @@ -2975,8 +2975,8 @@ setup_ff_generate_mipmap(struct gl_context *ctx, _mesa_BindVertexArrayAPPLE(mipmap->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &mipmap->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO); + _mesa_GenBuffers(1, &mipmap->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, mipmap->VBO); /* setup vertex arrays */ _mesa_VertexPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(x)); _mesa_TexCoordPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(tex)); @@ -3058,13 +3058,13 @@ setup_glsl_generate_mipmap(struct gl_context *ctx, _mesa_BindVertexArray(mipmap->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &mipmap->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO); + _mesa_GenBuffers(1, &mipmap->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, mipmap->VBO); /* setup vertex arrays */ - _mesa_VertexAttribPointerARB(0, 2, GL_FLOAT, GL_FALSE, + _mesa_VertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(struct vertex), OFFSET(x)); - _mesa_VertexAttribPointerARB(1, 3, GL_FLOAT, GL_FALSE, + _mesa_VertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(struct vertex), OFFSET(tex)); } @@ -3133,10 +3133,10 @@ setup_glsl_generate_mipmap(struct gl_context *ctx, _mesa_DeleteObjectARB(fs); _mesa_AttachShader(mipmap->ShaderProg, vs); _mesa_DeleteObjectARB(vs); - _mesa_BindAttribLocationARB(mipmap->ShaderProg, 0, "position"); - _mesa_BindAttribLocationARB(mipmap->ShaderProg, 1, "texcoords"); - _mesa_EnableVertexAttribArrayARB(0); - _mesa_EnableVertexAttribArrayARB(1); + _mesa_BindAttribLocation(mipmap->ShaderProg, 0, "position"); + _mesa_BindAttribLocation(mipmap->ShaderProg, 1, "texcoords"); + _mesa_EnableVertexAttribArray(0); + _mesa_EnableVertexAttribArray(1); link_program_with_debug(ctx, mipmap->ShaderProg); sampler->shader_prog = mipmap->ShaderProg; ralloc_free(mem_ctx); @@ -3149,9 +3149,9 @@ meta_glsl_generate_mipmap_cleanup(struct gl_context *ctx, { if (mipmap->ArrayObj == 0) return; - _mesa_DeleteVertexArraysAPPLE(1, &mipmap->ArrayObj); + _mesa_DeleteVertexArrays(1, &mipmap->ArrayObj); mipmap->ArrayObj = 0; - _mesa_DeleteBuffersARB(1, &mipmap->VBO); + _mesa_DeleteBuffers(1, &mipmap->VBO); mipmap->VBO = 0; _mesa_DeleteObjectARB(mipmap->sampler_1d.shader_prog); @@ -3219,7 +3219,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, */ if (use_glsl_version) { setup_glsl_generate_mipmap(ctx, mipmap, target); - _mesa_UseProgramObjectARB(mipmap->ShaderProg); + _mesa_UseProgram(mipmap->ShaderProg); } else { setup_ff_generate_mipmap(ctx, mipmap); @@ -3227,7 +3227,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, } _mesa_BindVertexArray(mipmap->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, mipmap->VBO); samplerSave = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler ? ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler->Name : 0; @@ -3236,7 +3236,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, _mesa_BindTexture(target, texObj->Name); if (!mipmap->FBO) { - _mesa_GenFramebuffersEXT(1, &mipmap->FBO); + _mesa_GenFramebuffers(1, &mipmap->FBO); } if (!mipmap->Sampler) { @@ -3264,7 +3264,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, _mesa_BindSampler(ctx->Texture.CurrentUnit, mipmap->Sampler); } - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO); if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES) _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, GL_FALSE); @@ -3291,7 +3291,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, verts[3].y = 1.0F; /* upload vertex data */ - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, GL_DYNAMIC_DRAW_ARB); /* texture is already locked, unlock now */ @@ -3345,7 +3345,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, /* Set to draw into the current dstLevel */ if (target == GL_TEXTURE_1D) { - _mesa_FramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT, + _mesa_FramebufferTexture1D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, target, texObj->Name, @@ -3353,7 +3353,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, } else if (target == GL_TEXTURE_3D) { GLint zoffset = 0; /* XXX unfinished */ - _mesa_FramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT, + _mesa_FramebufferTexture3D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, target, texObj->Name, @@ -3361,7 +3361,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, } else { /* 2D / cube */ - _mesa_FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, + _mesa_FramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, faceTarget, texObj->Name, @@ -3371,7 +3371,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, _mesa_DrawBuffer(GL_COLOR_ATTACHMENT0_EXT); /* sanity check */ - status = _mesa_CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); + status = _mesa_CheckFramebufferStatus(GL_FRAMEBUFFER_EXT); if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { _mesa_problem(ctx, "Unexpected incomplete framebuffer in " "_mesa_meta_GenerateMipmap()"); @@ -3397,7 +3397,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, if (genMipmapSave) _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, genMipmapSave); - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboSave); } @@ -3574,23 +3574,23 @@ decompress_texture_image(struct gl_context *ctx, /* Create/bind FBO/renderbuffer */ if (decompress->FBO == 0) { - _mesa_GenFramebuffersEXT(1, &decompress->FBO); - _mesa_GenRenderbuffersEXT(1, &decompress->RBO); - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, decompress->FBO); - _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, decompress->RBO); - _mesa_FramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, + _mesa_GenFramebuffers(1, &decompress->FBO); + _mesa_GenRenderbuffers(1, &decompress->RBO); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, decompress->FBO); + _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, decompress->RBO); + _mesa_FramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, decompress->RBO); } else { - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, decompress->FBO); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, decompress->FBO); } /* alloc dest surface */ if (width > decompress->Width || height > decompress->Height) { - _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, decompress->RBO); - _mesa_RenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA, + _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, decompress->RBO); + _mesa_RenderbufferStorage(GL_RENDERBUFFER_EXT, GL_RGBA, width, height); decompress->Width = width; decompress->Height = height; @@ -3603,9 +3603,9 @@ decompress_texture_image(struct gl_context *ctx, _mesa_BindVertexArray(decompress->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &decompress->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, decompress->VBO); - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_GenBuffers(1, &decompress->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, decompress->VBO); + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), NULL, GL_DYNAMIC_DRAW_ARB); /* setup vertex arrays */ @@ -3616,7 +3616,7 @@ decompress_texture_image(struct gl_context *ctx, } else { _mesa_BindVertexArray(decompress->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, decompress->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, decompress->VBO); } if (!decompress->Sampler) { @@ -3652,7 +3652,7 @@ decompress_texture_image(struct gl_context *ctx, verts[3].y = height; /* upload new vertex data */ - _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); /* setup texture state */ _mesa_BindTexture(target, texObj->Name); @@ -3713,13 +3713,13 @@ decompress_texture_image(struct gl_context *ctx, /* restore fbo bindings */ if (fboDrawSave == fboReadSave) { - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboDrawSave); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboDrawSave); } else { - _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, fboDrawSave); - _mesa_BindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, fboReadSave); + _mesa_BindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, fboDrawSave); + _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER_EXT, fboReadSave); } - _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, rbSave); + _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, rbSave); } @@ -3784,9 +3784,9 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, _mesa_BindVertexArray(drawtex->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &drawtex->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, drawtex->VBO); - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_GenBuffers(1, &drawtex->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, drawtex->VBO); + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), NULL, GL_DYNAMIC_DRAW_ARB); /* client active texture is not part of the array object */ @@ -3796,17 +3796,17 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x)); _mesa_EnableClientState(GL_VERTEX_ARRAY); for (i = 0; i < ctx->Const.MaxTextureUnits; i++) { - _mesa_ClientActiveTextureARB(GL_TEXTURE0 + i); + _mesa_ClientActiveTexture(GL_TEXTURE0 + i); _mesa_TexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(st[i])); _mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY); } /* restore client active texture */ - _mesa_ClientActiveTextureARB(GL_TEXTURE0 + active_texture); + _mesa_ClientActiveTexture(GL_TEXTURE0 + active_texture); } else { _mesa_BindVertexArray(drawtex->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, drawtex->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, drawtex->VBO); } /* vertex positions, texcoords */ @@ -3871,7 +3871,7 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, verts[3].st[i][1] = t1; } - _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); } _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index 20b8ff4d1c7..0fa2429976b 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -1068,25 +1068,25 @@ VertexAttrib4fvARB(GLuint index, const GLfloat *v) static void GLAPIENTRY VertexAttrib1dvARB(GLuint index, const GLdouble *v) { - CALL_VertexAttrib1dvARB(GET_DISPATCH(), (index, v)); + CALL_VertexAttrib1dv(GET_DISPATCH(), (index, v)); } static void GLAPIENTRY VertexAttrib2dvARB(GLuint index, const GLdouble *v) { - CALL_VertexAttrib2dvARB(GET_DISPATCH(), (index, v)); + CALL_VertexAttrib2dv(GET_DISPATCH(), (index, v)); } static void GLAPIENTRY VertexAttrib3dvARB(GLuint index, const GLdouble *v) { - CALL_VertexAttrib3dvARB(GET_DISPATCH(), (index, v)); + CALL_VertexAttrib3dv(GET_DISPATCH(), (index, v)); } static void GLAPIENTRY VertexAttrib4dvARB(GLuint index, const GLdouble *v) { - CALL_VertexAttrib4dvARB(GET_DISPATCH(), (index, v)); + CALL_VertexAttrib4dv(GET_DISPATCH(), (index, v)); } @@ -1114,7 +1114,7 @@ VertexAttribI3bv(GLuint index, const GLbyte *v) static void GLAPIENTRY VertexAttribI4bv(GLuint index, const GLbyte *v) { - CALL_VertexAttribI4bvEXT(GET_DISPATCH(), (index, v)); + CALL_VertexAttribI4bv(GET_DISPATCH(), (index, v)); } @@ -1139,7 +1139,7 @@ VertexAttribI3ubv(GLuint index, const GLubyte *v) static void GLAPIENTRY VertexAttribI4ubv(GLuint index, const GLubyte *v) { - CALL_VertexAttribI4ubvEXT(GET_DISPATCH(), (index, v)); + CALL_VertexAttribI4ubv(GET_DISPATCH(), (index, v)); } @@ -1165,7 +1165,7 @@ VertexAttribI3sv(GLuint index, const GLshort *v) static void GLAPIENTRY VertexAttribI4sv(GLuint index, const GLshort *v) { - CALL_VertexAttribI4svEXT(GET_DISPATCH(), (index, v)); + CALL_VertexAttribI4sv(GET_DISPATCH(), (index, v)); } @@ -1190,7 +1190,7 @@ VertexAttribI3usv(GLuint index, const GLushort *v) static void GLAPIENTRY VertexAttribI4usv(GLuint index, const GLushort *v) { - CALL_VertexAttribI4usvEXT(GET_DISPATCH(), (index, v)); + CALL_VertexAttribI4usv(GET_DISPATCH(), (index, v)); } @@ -1405,14 +1405,14 @@ GLboolean _ae_create_context( struct gl_context *ctx ) return GL_TRUE; /* These _gloffset_* values may not be compile-time constants */ - SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bvEXT; - SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubvEXT; - SecondaryColorFuncs[2] = _gloffset_SecondaryColor3svEXT; - SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usvEXT; - SecondaryColorFuncs[4] = _gloffset_SecondaryColor3ivEXT; - SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uivEXT; + SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bv; + SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubv; + SecondaryColorFuncs[2] = _gloffset_SecondaryColor3sv; + SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usv; + SecondaryColorFuncs[4] = _gloffset_SecondaryColor3iv; + SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uiv; SecondaryColorFuncs[6] = _gloffset_SecondaryColor3fvEXT; - SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dvEXT; + SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dv; FogCoordFuncs[0] = -1; FogCoordFuncs[1] = -1; @@ -1421,7 +1421,7 @@ GLboolean _ae_create_context( struct gl_context *ctx ) FogCoordFuncs[4] = -1; FogCoordFuncs[5] = -1; FogCoordFuncs[6] = _gloffset_FogCoordfvEXT; - FogCoordFuncs[7] = _gloffset_FogCoorddvEXT; + FogCoordFuncs[7] = _gloffset_FogCoorddv; ctx->aelt_context = calloc(1, sizeof(AEcontext)); if (!ctx->aelt_context) diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c index 33155308640..6b66319a9e4 100644 --- a/src/mesa/main/api_loopback.c +++ b/src/mesa/main/api_loopback.c @@ -88,7 +88,7 @@ void GLAPIENTRY -loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ) +_mesa_Color3b( GLbyte red, GLbyte green, GLbyte blue ) { COLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green), @@ -97,41 +97,41 @@ loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ) } void GLAPIENTRY -loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue ) +_mesa_Color3d( GLdouble red, GLdouble green, GLdouble blue ) { COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, 1.0 ); } void GLAPIENTRY -loopback_Color3i_f( GLint red, GLint green, GLint blue ) +_mesa_Color3i( GLint red, GLint green, GLint blue ) { COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green), INT_TO_FLOAT(blue), 1.0); } void GLAPIENTRY -loopback_Color3s_f( GLshort red, GLshort green, GLshort blue ) +_mesa_Color3s( GLshort red, GLshort green, GLshort blue ) { COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green), SHORT_TO_FLOAT(blue), 1.0); } void GLAPIENTRY -loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue ) +_mesa_Color3ui( GLuint red, GLuint green, GLuint blue ) { COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green), UINT_TO_FLOAT(blue), 1.0 ); } void GLAPIENTRY -loopback_Color3us_f( GLushort red, GLushort green, GLushort blue ) +_mesa_Color3us( GLushort red, GLushort green, GLushort blue ) { COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green), USHORT_TO_FLOAT(blue), 1.0 ); } void GLAPIENTRY -loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue ) +_mesa_Color3ub( GLubyte red, GLubyte green, GLubyte blue ) { COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green), UBYTE_TO_FLOAT(blue), 1.0 ); @@ -139,48 +139,48 @@ loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue ) void GLAPIENTRY -loopback_Color3bv_f( const GLbyte *v ) +_mesa_Color3bv( const GLbyte *v ) { COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]), 1.0 ); } void GLAPIENTRY -loopback_Color3dv_f( const GLdouble *v ) +_mesa_Color3dv( const GLdouble *v ) { COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0 ); } void GLAPIENTRY -loopback_Color3iv_f( const GLint *v ) +_mesa_Color3iv( const GLint *v ) { COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]), 1.0 ); } void GLAPIENTRY -loopback_Color3sv_f( const GLshort *v ) +_mesa_Color3sv( const GLshort *v ) { COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]), 1.0 ); } void GLAPIENTRY -loopback_Color3uiv_f( const GLuint *v ) +_mesa_Color3uiv( const GLuint *v ) { COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), UINT_TO_FLOAT(v[2]), 1.0 ); } void GLAPIENTRY -loopback_Color3usv_f( const GLushort *v ) +_mesa_Color3usv( const GLushort *v ) { COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), USHORT_TO_FLOAT(v[2]), 1.0 ); } void GLAPIENTRY -loopback_Color3ubv_f( const GLubyte *v ) +_mesa_Color3ubv( const GLubyte *v ) { COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), UBYTE_TO_FLOAT(v[2]), 1.0 ); @@ -188,7 +188,7 @@ loopback_Color3ubv_f( const GLubyte *v ) void GLAPIENTRY -loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, +_mesa_Color4b( GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha ) { COLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green), @@ -196,21 +196,21 @@ loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, } void GLAPIENTRY -loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue, +_mesa_Color4d( GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha ) { COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, (GLfloat) alpha ); } void GLAPIENTRY -loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha ) +_mesa_Color4i( GLint red, GLint green, GLint blue, GLint alpha ) { COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green), INT_TO_FLOAT(blue), INT_TO_FLOAT(alpha) ); } void GLAPIENTRY -loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, +_mesa_Color4s( GLshort red, GLshort green, GLshort blue, GLshort alpha ) { COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green), @@ -218,21 +218,21 @@ loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, } void GLAPIENTRY -loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha ) +_mesa_Color4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha ) { COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green), UINT_TO_FLOAT(blue), UINT_TO_FLOAT(alpha) ); } void GLAPIENTRY -loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, GLushort alpha ) +_mesa_Color4us( GLushort red, GLushort green, GLushort blue, GLushort alpha ) { COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green), USHORT_TO_FLOAT(blue), USHORT_TO_FLOAT(alpha) ); } void GLAPIENTRY -loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) +_mesa_Color4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) { COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green), UBYTE_TO_FLOAT(blue), UBYTE_TO_FLOAT(alpha) ); @@ -240,7 +240,7 @@ loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) void GLAPIENTRY -loopback_Color4iv_f( const GLint *v ) +_mesa_Color4iv( const GLint *v ) { COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]) ); @@ -248,21 +248,21 @@ loopback_Color4iv_f( const GLint *v ) void GLAPIENTRY -loopback_Color4bv_f( const GLbyte *v ) +_mesa_Color4bv( const GLbyte *v ) { COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]) ); } void GLAPIENTRY -loopback_Color4dv_f( const GLdouble *v ) +_mesa_Color4dv( const GLdouble *v ) { COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_Color4sv_f( const GLshort *v) +_mesa_Color4sv( const GLshort *v) { COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3]) ); @@ -270,21 +270,21 @@ loopback_Color4sv_f( const GLshort *v) void GLAPIENTRY -loopback_Color4uiv_f( const GLuint *v) +_mesa_Color4uiv( const GLuint *v) { COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]) ); } void GLAPIENTRY -loopback_Color4usv_f( const GLushort *v) +_mesa_Color4usv( const GLushort *v) { COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]) ); } void GLAPIENTRY -loopback_Color4ubv_f( const GLubyte *v) +_mesa_Color4ubv( const GLubyte *v) { COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]) ); @@ -292,565 +292,565 @@ loopback_Color4ubv_f( const GLubyte *v) void GLAPIENTRY -loopback_FogCoorddEXT( GLdouble d ) +_mesa_FogCoordd( GLdouble d ) { FOGCOORDF( (GLfloat) d ); } void GLAPIENTRY -loopback_FogCoorddvEXT( const GLdouble *v ) +_mesa_FogCoorddv( const GLdouble *v ) { FOGCOORDF( (GLfloat) *v ); } void GLAPIENTRY -loopback_Indexd( GLdouble c ) +_mesa_Indexd( GLdouble c ) { INDEX( (GLfloat) c ); } void GLAPIENTRY -loopback_Indexi( GLint c ) +_mesa_Indexi( GLint c ) { INDEX( (GLfloat) c ); } void GLAPIENTRY -loopback_Indexs( GLshort c ) +_mesa_Indexs( GLshort c ) { INDEX( (GLfloat) c ); } void GLAPIENTRY -loopback_Indexub( GLubyte c ) +_mesa_Indexub( GLubyte c ) { INDEX( (GLfloat) c ); } void GLAPIENTRY -loopback_Indexdv( const GLdouble *c ) +_mesa_Indexdv( const GLdouble *c ) { INDEX( (GLfloat) *c ); } void GLAPIENTRY -loopback_Indexiv( const GLint *c ) +_mesa_Indexiv( const GLint *c ) { INDEX( (GLfloat) *c ); } void GLAPIENTRY -loopback_Indexsv( const GLshort *c ) +_mesa_Indexsv( const GLshort *c ) { INDEX( (GLfloat) *c ); } void GLAPIENTRY -loopback_Indexubv( const GLubyte *c ) +_mesa_Indexubv( const GLubyte *c ) { INDEX( (GLfloat) *c ); } void GLAPIENTRY -loopback_EdgeFlagv(const GLboolean *flag) +_mesa_EdgeFlagv(const GLboolean *flag) { CALL_EdgeFlag(GET_DISPATCH(), (*flag)); } void GLAPIENTRY -loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz ) +_mesa_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz ) { NORMAL( BYTE_TO_FLOAT(nx), BYTE_TO_FLOAT(ny), BYTE_TO_FLOAT(nz) ); } void GLAPIENTRY -loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz ) +_mesa_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz ) { NORMAL((GLfloat) nx, (GLfloat) ny, (GLfloat) nz); } void GLAPIENTRY -loopback_Normal3i( GLint nx, GLint ny, GLint nz ) +_mesa_Normal3i( GLint nx, GLint ny, GLint nz ) { NORMAL( INT_TO_FLOAT(nx), INT_TO_FLOAT(ny), INT_TO_FLOAT(nz) ); } void GLAPIENTRY -loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz ) +_mesa_Normal3s( GLshort nx, GLshort ny, GLshort nz ) { NORMAL( SHORT_TO_FLOAT(nx), SHORT_TO_FLOAT(ny), SHORT_TO_FLOAT(nz) ); } void GLAPIENTRY -loopback_Normal3bv( const GLbyte *v ) +_mesa_Normal3bv( const GLbyte *v ) { NORMAL( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]) ); } void GLAPIENTRY -loopback_Normal3dv( const GLdouble *v ) +_mesa_Normal3dv( const GLdouble *v ) { NORMAL( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_Normal3iv( const GLint *v ) +_mesa_Normal3iv( const GLint *v ) { NORMAL( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]) ); } void GLAPIENTRY -loopback_Normal3sv( const GLshort *v ) +_mesa_Normal3sv( const GLshort *v ) { NORMAL( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]) ); } void GLAPIENTRY -loopback_TexCoord1d( GLdouble s ) +_mesa_TexCoord1d( GLdouble s ) { TEXCOORD1((GLfloat) s); } void GLAPIENTRY -loopback_TexCoord1i( GLint s ) +_mesa_TexCoord1i( GLint s ) { TEXCOORD1((GLfloat) s); } void GLAPIENTRY -loopback_TexCoord1s( GLshort s ) +_mesa_TexCoord1s( GLshort s ) { TEXCOORD1((GLfloat) s); } void GLAPIENTRY -loopback_TexCoord2d( GLdouble s, GLdouble t ) +_mesa_TexCoord2d( GLdouble s, GLdouble t ) { TEXCOORD2((GLfloat) s,(GLfloat) t); } void GLAPIENTRY -loopback_TexCoord2s( GLshort s, GLshort t ) +_mesa_TexCoord2s( GLshort s, GLshort t ) { TEXCOORD2((GLfloat) s,(GLfloat) t); } void GLAPIENTRY -loopback_TexCoord2i( GLint s, GLint t ) +_mesa_TexCoord2i( GLint s, GLint t ) { TEXCOORD2((GLfloat) s,(GLfloat) t); } void GLAPIENTRY -loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r ) +_mesa_TexCoord3d( GLdouble s, GLdouble t, GLdouble r ) { TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r); } void GLAPIENTRY -loopback_TexCoord3i( GLint s, GLint t, GLint r ) +_mesa_TexCoord3i( GLint s, GLint t, GLint r ) { TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r); } void GLAPIENTRY -loopback_TexCoord3s( GLshort s, GLshort t, GLshort r ) +_mesa_TexCoord3s( GLshort s, GLshort t, GLshort r ) { TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r); } void GLAPIENTRY -loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ) +_mesa_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ) { TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q); } void GLAPIENTRY -loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q ) +_mesa_TexCoord4i( GLint s, GLint t, GLint r, GLint q ) { TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q); } void GLAPIENTRY -loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ) +_mesa_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ) { TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q); } void GLAPIENTRY -loopback_TexCoord1dv( const GLdouble *v ) +_mesa_TexCoord1dv( const GLdouble *v ) { TEXCOORD1((GLfloat) v[0]); } void GLAPIENTRY -loopback_TexCoord1iv( const GLint *v ) +_mesa_TexCoord1iv( const GLint *v ) { TEXCOORD1((GLfloat) v[0]); } void GLAPIENTRY -loopback_TexCoord1sv( const GLshort *v ) +_mesa_TexCoord1sv( const GLshort *v ) { TEXCOORD1((GLfloat) v[0]); } void GLAPIENTRY -loopback_TexCoord2dv( const GLdouble *v ) +_mesa_TexCoord2dv( const GLdouble *v ) { TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]); } void GLAPIENTRY -loopback_TexCoord2iv( const GLint *v ) +_mesa_TexCoord2iv( const GLint *v ) { TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]); } void GLAPIENTRY -loopback_TexCoord2sv( const GLshort *v ) +_mesa_TexCoord2sv( const GLshort *v ) { TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]); } void GLAPIENTRY -loopback_TexCoord3dv( const GLdouble *v ) +_mesa_TexCoord3dv( const GLdouble *v ) { TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]); } void GLAPIENTRY -loopback_TexCoord3iv( const GLint *v ) +_mesa_TexCoord3iv( const GLint *v ) { TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]); } void GLAPIENTRY -loopback_TexCoord3sv( const GLshort *v ) +_mesa_TexCoord3sv( const GLshort *v ) { TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]); } void GLAPIENTRY -loopback_TexCoord4dv( const GLdouble *v ) +_mesa_TexCoord4dv( const GLdouble *v ) { TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]); } void GLAPIENTRY -loopback_TexCoord4iv( const GLint *v ) +_mesa_TexCoord4iv( const GLint *v ) { TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]); } void GLAPIENTRY -loopback_TexCoord4sv( const GLshort *v ) +_mesa_TexCoord4sv( const GLshort *v ) { TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]); } void GLAPIENTRY -loopback_Vertex2d( GLdouble x, GLdouble y ) +_mesa_Vertex2d( GLdouble x, GLdouble y ) { VERTEX2( (GLfloat) x, (GLfloat) y ); } void GLAPIENTRY -loopback_Vertex2i( GLint x, GLint y ) +_mesa_Vertex2i( GLint x, GLint y ) { VERTEX2( (GLfloat) x, (GLfloat) y ); } void GLAPIENTRY -loopback_Vertex2s( GLshort x, GLshort y ) +_mesa_Vertex2s( GLshort x, GLshort y ) { VERTEX2( (GLfloat) x, (GLfloat) y ); } void GLAPIENTRY -loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z ) +_mesa_Vertex3d( GLdouble x, GLdouble y, GLdouble z ) { VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z ); } void GLAPIENTRY -loopback_Vertex3i( GLint x, GLint y, GLint z ) +_mesa_Vertex3i( GLint x, GLint y, GLint z ) { VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z ); } void GLAPIENTRY -loopback_Vertex3s( GLshort x, GLshort y, GLshort z ) +_mesa_Vertex3s( GLshort x, GLshort y, GLshort z ) { VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z ); } void GLAPIENTRY -loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ) +_mesa_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ) { VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w ); } void GLAPIENTRY -loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w ) +_mesa_Vertex4i( GLint x, GLint y, GLint z, GLint w ) { VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w ); } void GLAPIENTRY -loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w ) +_mesa_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w ) { VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w ); } void GLAPIENTRY -loopback_Vertex2dv( const GLdouble *v ) +_mesa_Vertex2dv( const GLdouble *v ) { VERTEX2( (GLfloat) v[0], (GLfloat) v[1] ); } void GLAPIENTRY -loopback_Vertex2iv( const GLint *v ) +_mesa_Vertex2iv( const GLint *v ) { VERTEX2( (GLfloat) v[0], (GLfloat) v[1] ); } void GLAPIENTRY -loopback_Vertex2sv( const GLshort *v ) +_mesa_Vertex2sv( const GLshort *v ) { VERTEX2( (GLfloat) v[0], (GLfloat) v[1] ); } void GLAPIENTRY -loopback_Vertex3dv( const GLdouble *v ) +_mesa_Vertex3dv( const GLdouble *v ) { VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_Vertex3iv( const GLint *v ) +_mesa_Vertex3iv( const GLint *v ) { VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_Vertex3sv( const GLshort *v ) +_mesa_Vertex3sv( const GLshort *v ) { VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_Vertex4dv( const GLdouble *v ) +_mesa_Vertex4dv( const GLdouble *v ) { VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_Vertex4iv( const GLint *v ) +_mesa_Vertex4iv( const GLint *v ) { VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_Vertex4sv( const GLshort *v ) +_mesa_Vertex4sv( const GLshort *v ) { VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_MultiTexCoord1dARB(GLenum target, GLdouble s) +_mesa_MultiTexCoord1d(GLenum target, GLdouble s) { MULTI_TEXCOORD1( target, (GLfloat) s ); } void GLAPIENTRY -loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v) +_mesa_MultiTexCoord1dv(GLenum target, const GLdouble *v) { MULTI_TEXCOORD1( target, (GLfloat) v[0] ); } void GLAPIENTRY -loopback_MultiTexCoord1iARB(GLenum target, GLint s) +_mesa_MultiTexCoord1i(GLenum target, GLint s) { MULTI_TEXCOORD1( target, (GLfloat) s ); } void GLAPIENTRY -loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v) +_mesa_MultiTexCoord1iv(GLenum target, const GLint *v) { MULTI_TEXCOORD1( target, (GLfloat) v[0] ); } void GLAPIENTRY -loopback_MultiTexCoord1sARB(GLenum target, GLshort s) +_mesa_MultiTexCoord1s(GLenum target, GLshort s) { MULTI_TEXCOORD1( target, (GLfloat) s ); } void GLAPIENTRY -loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v) +_mesa_MultiTexCoord1sv(GLenum target, const GLshort *v) { MULTI_TEXCOORD1( target, (GLfloat) v[0] ); } void GLAPIENTRY -loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t) +_mesa_MultiTexCoord2d(GLenum target, GLdouble s, GLdouble t) { MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t ); } void GLAPIENTRY -loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v) +_mesa_MultiTexCoord2dv(GLenum target, const GLdouble *v) { MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] ); } void GLAPIENTRY -loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t) +_mesa_MultiTexCoord2i(GLenum target, GLint s, GLint t) { MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t ); } void GLAPIENTRY -loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v) +_mesa_MultiTexCoord2iv(GLenum target, const GLint *v) { MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] ); } void GLAPIENTRY -loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t) +_mesa_MultiTexCoord2s(GLenum target, GLshort s, GLshort t) { MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t ); } void GLAPIENTRY -loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v) +_mesa_MultiTexCoord2sv(GLenum target, const GLshort *v) { MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] ); } void GLAPIENTRY -loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r) +_mesa_MultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r) { MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r ); } void GLAPIENTRY -loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v) +_mesa_MultiTexCoord3dv(GLenum target, const GLdouble *v) { MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r) +_mesa_MultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r) { MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r ); } void GLAPIENTRY -loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v) +_mesa_MultiTexCoord3iv(GLenum target, const GLint *v) { MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r) +_mesa_MultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r) { MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r ); } void GLAPIENTRY -loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v) +_mesa_MultiTexCoord3sv(GLenum target, const GLshort *v) { MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q) +_mesa_MultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q) { MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, (GLfloat) r, (GLfloat) q ); } void GLAPIENTRY -loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v) +_mesa_MultiTexCoord4dv(GLenum target, const GLdouble *v) { MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q) +_mesa_MultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q) { MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, (GLfloat) r, (GLfloat) q ); } void GLAPIENTRY -loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v) +_mesa_MultiTexCoord4iv(GLenum target, const GLint *v) { MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q) +_mesa_MultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q) { MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, (GLfloat) r, (GLfloat) q ); } void GLAPIENTRY -loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v) +_mesa_MultiTexCoord4sv(GLenum target, const GLshort *v) { MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_EvalCoord2dv( const GLdouble *u ) +_mesa_EvalCoord2dv( const GLdouble *u ) { EVALCOORD2( (GLfloat) u[0], (GLfloat) u[1] ); } void GLAPIENTRY -loopback_EvalCoord2fv( const GLfloat *u ) +_mesa_EvalCoord2fv( const GLfloat *u ) { EVALCOORD2( u[0], u[1] ); } void GLAPIENTRY -loopback_EvalCoord2d( GLdouble u, GLdouble v ) +_mesa_EvalCoord2d( GLdouble u, GLdouble v ) { EVALCOORD2( (GLfloat) u, (GLfloat) v ); } void GLAPIENTRY -loopback_EvalCoord1dv( const GLdouble *u ) +_mesa_EvalCoord1dv( const GLdouble *u ) { EVALCOORD1( (GLfloat) *u ); } void GLAPIENTRY -loopback_EvalCoord1fv( const GLfloat *u ) +_mesa_EvalCoord1fv( const GLfloat *u ) { EVALCOORD1( (GLfloat) *u ); } void GLAPIENTRY -loopback_EvalCoord1d( GLdouble u ) +_mesa_EvalCoord1d( GLdouble u ) { EVALCOORD1( (GLfloat) u ); } void GLAPIENTRY -loopback_Materialf( GLenum face, GLenum pname, GLfloat param ) +_mesa_Materialf( GLenum face, GLenum pname, GLfloat param ) { GLfloat fparam[4]; fparam[0] = param; @@ -858,14 +858,14 @@ loopback_Materialf( GLenum face, GLenum pname, GLfloat param ) } void GLAPIENTRY -loopback_Materiali(GLenum face, GLenum pname, GLint param ) +_mesa_Materiali(GLenum face, GLenum pname, GLint param ) { GLfloat p = (GLfloat) param; MATERIALFV(face, pname, &p); } void GLAPIENTRY -loopback_Materialiv(GLenum face, GLenum pname, const GLint *params ) +_mesa_Materialiv(GLenum face, GLenum pname, const GLint *params ) { GLfloat fparam[4]; switch (pname) { @@ -895,49 +895,49 @@ loopback_Materialiv(GLenum face, GLenum pname, const GLint *params ) void GLAPIENTRY -loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) +_mesa_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) { RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2); } void GLAPIENTRY -loopback_Rectdv(const GLdouble *v1, const GLdouble *v2) +_mesa_Rectdv(const GLdouble *v1, const GLdouble *v2) { RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]); } void GLAPIENTRY -loopback_Rectfv(const GLfloat *v1, const GLfloat *v2) +_mesa_Rectfv(const GLfloat *v1, const GLfloat *v2) { RECTF(v1[0], v1[1], v2[0], v2[1]); } void GLAPIENTRY -loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2) +_mesa_Recti(GLint x1, GLint y1, GLint x2, GLint y2) { RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2); } void GLAPIENTRY -loopback_Rectiv(const GLint *v1, const GLint *v2) +_mesa_Rectiv(const GLint *v1, const GLint *v2) { RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]); } void GLAPIENTRY -loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2) +_mesa_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2) { RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2); } void GLAPIENTRY -loopback_Rectsv(const GLshort *v1, const GLshort *v2) +_mesa_Rectsv(const GLshort *v1, const GLshort *v2) { RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]); } void GLAPIENTRY -loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue ) +_mesa_SecondaryColor3b( GLbyte red, GLbyte green, GLbyte blue ) { SECONDARYCOLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green), @@ -945,13 +945,13 @@ loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue ) } void GLAPIENTRY -loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue ) +_mesa_SecondaryColor3d( GLdouble red, GLdouble green, GLdouble blue ) { SECONDARYCOLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue ); } void GLAPIENTRY -loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue ) +_mesa_SecondaryColor3i( GLint red, GLint green, GLint blue ) { SECONDARYCOLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green), @@ -959,7 +959,7 @@ loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue ) } void GLAPIENTRY -loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue ) +_mesa_SecondaryColor3s( GLshort red, GLshort green, GLshort blue ) { SECONDARYCOLORF(SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green), @@ -967,7 +967,7 @@ loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue ) } void GLAPIENTRY -loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue ) +_mesa_SecondaryColor3ui( GLuint red, GLuint green, GLuint blue ) { SECONDARYCOLORF(UINT_TO_FLOAT(red), UINT_TO_FLOAT(green), @@ -975,7 +975,7 @@ loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue ) } void GLAPIENTRY -loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue ) +_mesa_SecondaryColor3us( GLushort red, GLushort green, GLushort blue ) { SECONDARYCOLORF(USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green), @@ -983,7 +983,7 @@ loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue ) } void GLAPIENTRY -loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue ) +_mesa_SecondaryColor3ub( GLubyte red, GLubyte green, GLubyte blue ) { SECONDARYCOLORF(UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green), @@ -991,7 +991,7 @@ loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue ) } void GLAPIENTRY -loopback_SecondaryColor3bvEXT_f( const GLbyte *v ) +_mesa_SecondaryColor3bv( const GLbyte *v ) { SECONDARYCOLORF(BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), @@ -999,12 +999,12 @@ loopback_SecondaryColor3bvEXT_f( const GLbyte *v ) } void GLAPIENTRY -loopback_SecondaryColor3dvEXT_f( const GLdouble *v ) +_mesa_SecondaryColor3dv( const GLdouble *v ) { SECONDARYCOLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_SecondaryColor3ivEXT_f( const GLint *v ) +_mesa_SecondaryColor3iv( const GLint *v ) { SECONDARYCOLORF(INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), @@ -1012,7 +1012,7 @@ loopback_SecondaryColor3ivEXT_f( const GLint *v ) } void GLAPIENTRY -loopback_SecondaryColor3svEXT_f( const GLshort *v ) +_mesa_SecondaryColor3sv( const GLshort *v ) { SECONDARYCOLORF(SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), @@ -1020,7 +1020,7 @@ loopback_SecondaryColor3svEXT_f( const GLshort *v ) } void GLAPIENTRY -loopback_SecondaryColor3uivEXT_f( const GLuint *v ) +_mesa_SecondaryColor3uiv( const GLuint *v ) { SECONDARYCOLORF(UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), @@ -1028,7 +1028,7 @@ loopback_SecondaryColor3uivEXT_f( const GLuint *v ) } void GLAPIENTRY -loopback_SecondaryColor3usvEXT_f( const GLushort *v ) +_mesa_SecondaryColor3usv( const GLushort *v ) { SECONDARYCOLORF(USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), @@ -1036,7 +1036,7 @@ loopback_SecondaryColor3usvEXT_f( const GLushort *v ) } void GLAPIENTRY -loopback_SecondaryColor3ubvEXT_f( const GLubyte *v ) +_mesa_SecondaryColor3ubv( const GLubyte *v ) { SECONDARYCOLORF(UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), @@ -1051,111 +1051,111 @@ loopback_SecondaryColor3ubvEXT_f( const GLubyte *v ) */ void GLAPIENTRY -loopback_VertexAttrib1sNV(GLuint index, GLshort x) +_mesa_VertexAttrib1sNV(GLuint index, GLshort x) { ATTRIB1NV(index, (GLfloat) x); } void GLAPIENTRY -loopback_VertexAttrib1dNV(GLuint index, GLdouble x) +_mesa_VertexAttrib1dNV(GLuint index, GLdouble x) { ATTRIB1NV(index, (GLfloat) x); } void GLAPIENTRY -loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y) +_mesa_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y) { ATTRIB2NV(index, (GLfloat) x, y); } void GLAPIENTRY -loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y) +_mesa_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y) { ATTRIB2NV(index, (GLfloat) x, (GLfloat) y); } void GLAPIENTRY -loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z) +_mesa_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z) { ATTRIB3NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z); } void GLAPIENTRY -loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z) +_mesa_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z) { ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } void GLAPIENTRY -loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w) +_mesa_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w) { ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } void GLAPIENTRY -loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) +_mesa_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) { ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } void GLAPIENTRY -loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) +_mesa_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) { ATTRIB4NV(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y), UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w)); } void GLAPIENTRY -loopback_VertexAttrib1svNV(GLuint index, const GLshort *v) +_mesa_VertexAttrib1svNV(GLuint index, const GLshort *v) { ATTRIB1NV(index, (GLfloat) v[0]); } void GLAPIENTRY -loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v) +_mesa_VertexAttrib1dvNV(GLuint index, const GLdouble *v) { ATTRIB1NV(index, (GLfloat) v[0]); } void GLAPIENTRY -loopback_VertexAttrib2svNV(GLuint index, const GLshort *v) +_mesa_VertexAttrib2svNV(GLuint index, const GLshort *v) { ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]); } void GLAPIENTRY -loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v) +_mesa_VertexAttrib2dvNV(GLuint index, const GLdouble *v) { ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]); } void GLAPIENTRY -loopback_VertexAttrib3svNV(GLuint index, const GLshort *v) +_mesa_VertexAttrib3svNV(GLuint index, const GLshort *v) { ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } void GLAPIENTRY -loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v) +_mesa_VertexAttrib3dvNV(GLuint index, const GLdouble *v) { ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } void GLAPIENTRY -loopback_VertexAttrib4svNV(GLuint index, const GLshort *v) +_mesa_VertexAttrib4svNV(GLuint index, const GLshort *v) { ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat)v[3]); } void GLAPIENTRY -loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v) +_mesa_VertexAttrib4dvNV(GLuint index, const GLdouble *v) { ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v) +_mesa_VertexAttrib4ubvNV(GLuint index, const GLubyte *v) { ATTRIB4NV(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3])); @@ -1163,15 +1163,15 @@ loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v) void GLAPIENTRY -loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v) +_mesa_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib1svNV(index + i, v + i); + _mesa_VertexAttrib1svNV(index + i, v + i); } void GLAPIENTRY -loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v) +_mesa_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; for (i = n - 1; i >= 0; i--) @@ -1179,23 +1179,23 @@ loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v) } void GLAPIENTRY -loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v) +_mesa_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib1dvNV(index + i, v + i); + _mesa_VertexAttrib1dvNV(index + i, v + i); } void GLAPIENTRY -loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v) +_mesa_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib2svNV(index + i, v + 2 * i); + _mesa_VertexAttrib2svNV(index + i, v + 2 * i); } void GLAPIENTRY -loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v) +_mesa_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; for (i = n - 1; i >= 0; i--) @@ -1203,23 +1203,23 @@ loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v) } void GLAPIENTRY -loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v) +_mesa_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib2dvNV(index + i, v + 2 * i); + _mesa_VertexAttrib2dvNV(index + i, v + 2 * i); } void GLAPIENTRY -loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v) +_mesa_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib3svNV(index + i, v + 3 * i); + _mesa_VertexAttrib3svNV(index + i, v + 3 * i); } void GLAPIENTRY -loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v) +_mesa_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; for (i = n - 1; i >= 0; i--) @@ -1227,23 +1227,23 @@ loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v) } void GLAPIENTRY -loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v) +_mesa_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib3dvNV(index + i, v + 3 * i); + _mesa_VertexAttrib3dvNV(index + i, v + 3 * i); } void GLAPIENTRY -loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v) +_mesa_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib4svNV(index + i, v + 4 * i); + _mesa_VertexAttrib4svNV(index + i, v + 4 * i); } void GLAPIENTRY -loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v) +_mesa_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; for (i = n - 1; i >= 0; i--) @@ -1251,19 +1251,19 @@ loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v) } void GLAPIENTRY -loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v) +_mesa_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib4dvNV(index + i, v + 4 * i); + _mesa_VertexAttrib4dvNV(index + i, v + 4 * i); } void GLAPIENTRY -loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v) +_mesa_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib4ubvNV(index + i, v + 4 * i); + _mesa_VertexAttrib4ubvNV(index + i, v + 4 * i); } @@ -1274,176 +1274,176 @@ loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v) */ void GLAPIENTRY -loopback_VertexAttrib1sARB(GLuint index, GLshort x) +_mesa_VertexAttrib1s(GLuint index, GLshort x) { ATTRIB1ARB(index, (GLfloat) x); } void GLAPIENTRY -loopback_VertexAttrib1dARB(GLuint index, GLdouble x) +_mesa_VertexAttrib1d(GLuint index, GLdouble x) { ATTRIB1ARB(index, (GLfloat) x); } void GLAPIENTRY -loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y) +_mesa_VertexAttrib2s(GLuint index, GLshort x, GLshort y) { ATTRIB2ARB(index, (GLfloat) x, y); } void GLAPIENTRY -loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y) +_mesa_VertexAttrib2d(GLuint index, GLdouble x, GLdouble y) { ATTRIB2ARB(index, (GLfloat) x, (GLfloat) y); } void GLAPIENTRY -loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z) +_mesa_VertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z) { ATTRIB3ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z); } void GLAPIENTRY -loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z) +_mesa_VertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z) { ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } void GLAPIENTRY -loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w) +_mesa_VertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w) { ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } void GLAPIENTRY -loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) +_mesa_VertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) { ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } void GLAPIENTRY -loopback_VertexAttrib1svARB(GLuint index, const GLshort *v) +_mesa_VertexAttrib1sv(GLuint index, const GLshort *v) { ATTRIB1ARB(index, (GLfloat) v[0]); } void GLAPIENTRY -loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v) +_mesa_VertexAttrib1dv(GLuint index, const GLdouble *v) { ATTRIB1ARB(index, (GLfloat) v[0]); } void GLAPIENTRY -loopback_VertexAttrib2svARB(GLuint index, const GLshort *v) +_mesa_VertexAttrib2sv(GLuint index, const GLshort *v) { ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]); } void GLAPIENTRY -loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v) +_mesa_VertexAttrib2dv(GLuint index, const GLdouble *v) { ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]); } void GLAPIENTRY -loopback_VertexAttrib3svARB(GLuint index, const GLshort *v) +_mesa_VertexAttrib3sv(GLuint index, const GLshort *v) { ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } void GLAPIENTRY -loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v) +_mesa_VertexAttrib3dv(GLuint index, const GLdouble *v) { ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } void GLAPIENTRY -loopback_VertexAttrib4svARB(GLuint index, const GLshort *v) +_mesa_VertexAttrib4sv(GLuint index, const GLshort *v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat)v[3]); } void GLAPIENTRY -loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v) +_mesa_VertexAttrib4dv(GLuint index, const GLdouble *v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v) +_mesa_VertexAttrib4bv(GLuint index, const GLbyte * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4ivARB(GLuint index, const GLint * v) +_mesa_VertexAttrib4iv(GLuint index, const GLint * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v) +_mesa_VertexAttrib4ubv(GLuint index, const GLubyte * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v) +_mesa_VertexAttrib4usv(GLuint index, const GLushort * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v) +_mesa_VertexAttrib4uiv(GLuint index, const GLuint * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v) +_mesa_VertexAttrib4Nbv(GLuint index, const GLbyte * v) { ATTRIB4ARB(index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3])); } void GLAPIENTRY -loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v) +_mesa_VertexAttrib4Nsv(GLuint index, const GLshort * v) { ATTRIB4ARB(index, SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3])); } void GLAPIENTRY -loopback_VertexAttrib4NivARB(GLuint index, const GLint * v) +_mesa_VertexAttrib4Niv(GLuint index, const GLint * v) { ATTRIB4ARB(index, INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3])); } void GLAPIENTRY -loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) +_mesa_VertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) { ATTRIB4ARB(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y), UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w)); } void GLAPIENTRY -loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v) +_mesa_VertexAttrib4Nubv(GLuint index, const GLubyte * v) { ATTRIB4ARB(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3])); } void GLAPIENTRY -loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v) +_mesa_VertexAttrib4Nusv(GLuint index, const GLushort * v) { ATTRIB4ARB(index, USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3])); } void GLAPIENTRY -loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v) +_mesa_VertexAttrib4Nuiv(GLuint index, const GLuint * v) { ATTRIB4ARB(index, UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3])); @@ -1457,37 +1457,37 @@ loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v) */ void GLAPIENTRY -loopback_VertexAttribI1iv(GLuint index, const GLint *v) +_mesa_VertexAttribI1iv(GLuint index, const GLint *v) { ATTRIBI_1I(index, v[0]); } void GLAPIENTRY -loopback_VertexAttribI1uiv(GLuint index, const GLuint *v) +_mesa_VertexAttribI1uiv(GLuint index, const GLuint *v) { ATTRIBI_1UI(index, v[0]); } void GLAPIENTRY -loopback_VertexAttribI4bv(GLuint index, const GLbyte *v) +_mesa_VertexAttribI4bv(GLuint index, const GLbyte *v) { ATTRIBI_4I(index, v[0], v[1], v[2], v[3]); } void GLAPIENTRY -loopback_VertexAttribI4sv(GLuint index, const GLshort *v) +_mesa_VertexAttribI4sv(GLuint index, const GLshort *v) { ATTRIBI_4I(index, v[0], v[1], v[2], v[3]); } void GLAPIENTRY -loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v) +_mesa_VertexAttribI4ubv(GLuint index, const GLubyte *v) { ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]); } void GLAPIENTRY -loopback_VertexAttribI4usv(GLuint index, const GLushort *v) +_mesa_VertexAttribI4usv(GLuint index, const GLushort *v) { ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]); } @@ -1504,226 +1504,226 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx, struct _glapi_table *dest) { if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_Color4ub(dest, loopback_Color4ub_f); - SET_Materialf(dest, loopback_Materialf); + SET_Color4ub(dest, _mesa_Color4ub); + SET_Materialf(dest, _mesa_Materialf); } if (ctx->API == API_OPENGL) { - SET_Color3b(dest, loopback_Color3b_f); - SET_Color3d(dest, loopback_Color3d_f); - SET_Color3i(dest, loopback_Color3i_f); - SET_Color3s(dest, loopback_Color3s_f); - SET_Color3ui(dest, loopback_Color3ui_f); - SET_Color3us(dest, loopback_Color3us_f); - SET_Color3ub(dest, loopback_Color3ub_f); - SET_Color4b(dest, loopback_Color4b_f); - SET_Color4d(dest, loopback_Color4d_f); - SET_Color4i(dest, loopback_Color4i_f); - SET_Color4s(dest, loopback_Color4s_f); - SET_Color4ui(dest, loopback_Color4ui_f); - SET_Color4us(dest, loopback_Color4us_f); - SET_Color3bv(dest, loopback_Color3bv_f); - SET_Color3dv(dest, loopback_Color3dv_f); - SET_Color3iv(dest, loopback_Color3iv_f); - SET_Color3sv(dest, loopback_Color3sv_f); - SET_Color3uiv(dest, loopback_Color3uiv_f); - SET_Color3usv(dest, loopback_Color3usv_f); - SET_Color3ubv(dest, loopback_Color3ubv_f); - SET_Color4bv(dest, loopback_Color4bv_f); - SET_Color4dv(dest, loopback_Color4dv_f); - SET_Color4iv(dest, loopback_Color4iv_f); - SET_Color4sv(dest, loopback_Color4sv_f); - SET_Color4uiv(dest, loopback_Color4uiv_f); - SET_Color4usv(dest, loopback_Color4usv_f); - SET_Color4ubv(dest, loopback_Color4ubv_f); - - SET_SecondaryColor3bEXT(dest, loopback_SecondaryColor3bEXT_f); - SET_SecondaryColor3dEXT(dest, loopback_SecondaryColor3dEXT_f); - SET_SecondaryColor3iEXT(dest, loopback_SecondaryColor3iEXT_f); - SET_SecondaryColor3sEXT(dest, loopback_SecondaryColor3sEXT_f); - SET_SecondaryColor3uiEXT(dest, loopback_SecondaryColor3uiEXT_f); - SET_SecondaryColor3usEXT(dest, loopback_SecondaryColor3usEXT_f); - SET_SecondaryColor3ubEXT(dest, loopback_SecondaryColor3ubEXT_f); - SET_SecondaryColor3bvEXT(dest, loopback_SecondaryColor3bvEXT_f); - SET_SecondaryColor3dvEXT(dest, loopback_SecondaryColor3dvEXT_f); - SET_SecondaryColor3ivEXT(dest, loopback_SecondaryColor3ivEXT_f); - SET_SecondaryColor3svEXT(dest, loopback_SecondaryColor3svEXT_f); - SET_SecondaryColor3uivEXT(dest, loopback_SecondaryColor3uivEXT_f); - SET_SecondaryColor3usvEXT(dest, loopback_SecondaryColor3usvEXT_f); - SET_SecondaryColor3ubvEXT(dest, loopback_SecondaryColor3ubvEXT_f); + SET_Color3b(dest, _mesa_Color3b); + SET_Color3d(dest, _mesa_Color3d); + SET_Color3i(dest, _mesa_Color3i); + SET_Color3s(dest, _mesa_Color3s); + SET_Color3ui(dest, _mesa_Color3ui); + SET_Color3us(dest, _mesa_Color3us); + SET_Color3ub(dest, _mesa_Color3ub); + SET_Color4b(dest, _mesa_Color4b); + SET_Color4d(dest, _mesa_Color4d); + SET_Color4i(dest, _mesa_Color4i); + SET_Color4s(dest, _mesa_Color4s); + SET_Color4ui(dest, _mesa_Color4ui); + SET_Color4us(dest, _mesa_Color4us); + SET_Color3bv(dest, _mesa_Color3bv); + SET_Color3dv(dest, _mesa_Color3dv); + SET_Color3iv(dest, _mesa_Color3iv); + SET_Color3sv(dest, _mesa_Color3sv); + SET_Color3uiv(dest, _mesa_Color3uiv); + SET_Color3usv(dest, _mesa_Color3usv); + SET_Color3ubv(dest, _mesa_Color3ubv); + SET_Color4bv(dest, _mesa_Color4bv); + SET_Color4dv(dest, _mesa_Color4dv); + SET_Color4iv(dest, _mesa_Color4iv); + SET_Color4sv(dest, _mesa_Color4sv); + SET_Color4uiv(dest, _mesa_Color4uiv); + SET_Color4usv(dest, _mesa_Color4usv); + SET_Color4ubv(dest, _mesa_Color4ubv); + + SET_SecondaryColor3b(dest, _mesa_SecondaryColor3b); + SET_SecondaryColor3d(dest, _mesa_SecondaryColor3d); + SET_SecondaryColor3i(dest, _mesa_SecondaryColor3i); + SET_SecondaryColor3s(dest, _mesa_SecondaryColor3s); + SET_SecondaryColor3ui(dest, _mesa_SecondaryColor3ui); + SET_SecondaryColor3us(dest, _mesa_SecondaryColor3us); + SET_SecondaryColor3ub(dest, _mesa_SecondaryColor3ub); + SET_SecondaryColor3bv(dest, _mesa_SecondaryColor3bv); + SET_SecondaryColor3dv(dest, _mesa_SecondaryColor3dv); + SET_SecondaryColor3iv(dest, _mesa_SecondaryColor3iv); + SET_SecondaryColor3sv(dest, _mesa_SecondaryColor3sv); + SET_SecondaryColor3uiv(dest, _mesa_SecondaryColor3uiv); + SET_SecondaryColor3usv(dest, _mesa_SecondaryColor3usv); + SET_SecondaryColor3ubv(dest, _mesa_SecondaryColor3ubv); - SET_EdgeFlagv(dest, loopback_EdgeFlagv); - - SET_Indexd(dest, loopback_Indexd); - SET_Indexi(dest, loopback_Indexi); - SET_Indexs(dest, loopback_Indexs); - SET_Indexub(dest, loopback_Indexub); - SET_Indexdv(dest, loopback_Indexdv); - SET_Indexiv(dest, loopback_Indexiv); - SET_Indexsv(dest, loopback_Indexsv); - SET_Indexubv(dest, loopback_Indexubv); - SET_Normal3b(dest, loopback_Normal3b); - SET_Normal3d(dest, loopback_Normal3d); - SET_Normal3i(dest, loopback_Normal3i); - SET_Normal3s(dest, loopback_Normal3s); - SET_Normal3bv(dest, loopback_Normal3bv); - SET_Normal3dv(dest, loopback_Normal3dv); - SET_Normal3iv(dest, loopback_Normal3iv); - SET_Normal3sv(dest, loopback_Normal3sv); - SET_TexCoord1d(dest, loopback_TexCoord1d); - SET_TexCoord1i(dest, loopback_TexCoord1i); - SET_TexCoord1s(dest, loopback_TexCoord1s); - SET_TexCoord2d(dest, loopback_TexCoord2d); - SET_TexCoord2s(dest, loopback_TexCoord2s); - SET_TexCoord2i(dest, loopback_TexCoord2i); - SET_TexCoord3d(dest, loopback_TexCoord3d); - SET_TexCoord3i(dest, loopback_TexCoord3i); - SET_TexCoord3s(dest, loopback_TexCoord3s); - SET_TexCoord4d(dest, loopback_TexCoord4d); - SET_TexCoord4i(dest, loopback_TexCoord4i); - SET_TexCoord4s(dest, loopback_TexCoord4s); - SET_TexCoord1dv(dest, loopback_TexCoord1dv); - SET_TexCoord1iv(dest, loopback_TexCoord1iv); - SET_TexCoord1sv(dest, loopback_TexCoord1sv); - SET_TexCoord2dv(dest, loopback_TexCoord2dv); - SET_TexCoord2iv(dest, loopback_TexCoord2iv); - SET_TexCoord2sv(dest, loopback_TexCoord2sv); - SET_TexCoord3dv(dest, loopback_TexCoord3dv); - SET_TexCoord3iv(dest, loopback_TexCoord3iv); - SET_TexCoord3sv(dest, loopback_TexCoord3sv); - SET_TexCoord4dv(dest, loopback_TexCoord4dv); - SET_TexCoord4iv(dest, loopback_TexCoord4iv); - SET_TexCoord4sv(dest, loopback_TexCoord4sv); - SET_Vertex2d(dest, loopback_Vertex2d); - SET_Vertex2i(dest, loopback_Vertex2i); - SET_Vertex2s(dest, loopback_Vertex2s); - SET_Vertex3d(dest, loopback_Vertex3d); - SET_Vertex3i(dest, loopback_Vertex3i); - SET_Vertex3s(dest, loopback_Vertex3s); - SET_Vertex4d(dest, loopback_Vertex4d); - SET_Vertex4i(dest, loopback_Vertex4i); - SET_Vertex4s(dest, loopback_Vertex4s); - SET_Vertex2dv(dest, loopback_Vertex2dv); - SET_Vertex2iv(dest, loopback_Vertex2iv); - SET_Vertex2sv(dest, loopback_Vertex2sv); - SET_Vertex3dv(dest, loopback_Vertex3dv); - SET_Vertex3iv(dest, loopback_Vertex3iv); - SET_Vertex3sv(dest, loopback_Vertex3sv); - SET_Vertex4dv(dest, loopback_Vertex4dv); - SET_Vertex4iv(dest, loopback_Vertex4iv); - SET_Vertex4sv(dest, loopback_Vertex4sv); - SET_MultiTexCoord1dARB(dest, loopback_MultiTexCoord1dARB); - SET_MultiTexCoord1dvARB(dest, loopback_MultiTexCoord1dvARB); - SET_MultiTexCoord1iARB(dest, loopback_MultiTexCoord1iARB); - SET_MultiTexCoord1ivARB(dest, loopback_MultiTexCoord1ivARB); - SET_MultiTexCoord1sARB(dest, loopback_MultiTexCoord1sARB); - SET_MultiTexCoord1svARB(dest, loopback_MultiTexCoord1svARB); - SET_MultiTexCoord2dARB(dest, loopback_MultiTexCoord2dARB); - SET_MultiTexCoord2dvARB(dest, loopback_MultiTexCoord2dvARB); - SET_MultiTexCoord2iARB(dest, loopback_MultiTexCoord2iARB); - SET_MultiTexCoord2ivARB(dest, loopback_MultiTexCoord2ivARB); - SET_MultiTexCoord2sARB(dest, loopback_MultiTexCoord2sARB); - SET_MultiTexCoord2svARB(dest, loopback_MultiTexCoord2svARB); - SET_MultiTexCoord3dARB(dest, loopback_MultiTexCoord3dARB); - SET_MultiTexCoord3dvARB(dest, loopback_MultiTexCoord3dvARB); - SET_MultiTexCoord3iARB(dest, loopback_MultiTexCoord3iARB); - SET_MultiTexCoord3ivARB(dest, loopback_MultiTexCoord3ivARB); - SET_MultiTexCoord3sARB(dest, loopback_MultiTexCoord3sARB); - SET_MultiTexCoord3svARB(dest, loopback_MultiTexCoord3svARB); - SET_MultiTexCoord4dARB(dest, loopback_MultiTexCoord4dARB); - SET_MultiTexCoord4dvARB(dest, loopback_MultiTexCoord4dvARB); - SET_MultiTexCoord4iARB(dest, loopback_MultiTexCoord4iARB); - SET_MultiTexCoord4ivARB(dest, loopback_MultiTexCoord4ivARB); - SET_MultiTexCoord4sARB(dest, loopback_MultiTexCoord4sARB); - SET_MultiTexCoord4svARB(dest, loopback_MultiTexCoord4svARB); - SET_EvalCoord2dv(dest, loopback_EvalCoord2dv); - SET_EvalCoord2fv(dest, loopback_EvalCoord2fv); - SET_EvalCoord2d(dest, loopback_EvalCoord2d); - SET_EvalCoord1dv(dest, loopback_EvalCoord1dv); - SET_EvalCoord1fv(dest, loopback_EvalCoord1fv); - SET_EvalCoord1d(dest, loopback_EvalCoord1d); - SET_Materiali(dest, loopback_Materiali); - SET_Materialiv(dest, loopback_Materialiv); - SET_Rectd(dest, loopback_Rectd); - SET_Rectdv(dest, loopback_Rectdv); - SET_Rectfv(dest, loopback_Rectfv); - SET_Recti(dest, loopback_Recti); - SET_Rectiv(dest, loopback_Rectiv); - SET_Rects(dest, loopback_Rects); - SET_Rectsv(dest, loopback_Rectsv); - SET_FogCoorddEXT(dest, loopback_FogCoorddEXT); - SET_FogCoorddvEXT(dest, loopback_FogCoorddvEXT); + SET_EdgeFlagv(dest, _mesa_EdgeFlagv); + + SET_Indexd(dest, _mesa_Indexd); + SET_Indexi(dest, _mesa_Indexi); + SET_Indexs(dest, _mesa_Indexs); + SET_Indexub(dest, _mesa_Indexub); + SET_Indexdv(dest, _mesa_Indexdv); + SET_Indexiv(dest, _mesa_Indexiv); + SET_Indexsv(dest, _mesa_Indexsv); + SET_Indexubv(dest, _mesa_Indexubv); + SET_Normal3b(dest, _mesa_Normal3b); + SET_Normal3d(dest, _mesa_Normal3d); + SET_Normal3i(dest, _mesa_Normal3i); + SET_Normal3s(dest, _mesa_Normal3s); + SET_Normal3bv(dest, _mesa_Normal3bv); + SET_Normal3dv(dest, _mesa_Normal3dv); + SET_Normal3iv(dest, _mesa_Normal3iv); + SET_Normal3sv(dest, _mesa_Normal3sv); + SET_TexCoord1d(dest, _mesa_TexCoord1d); + SET_TexCoord1i(dest, _mesa_TexCoord1i); + SET_TexCoord1s(dest, _mesa_TexCoord1s); + SET_TexCoord2d(dest, _mesa_TexCoord2d); + SET_TexCoord2s(dest, _mesa_TexCoord2s); + SET_TexCoord2i(dest, _mesa_TexCoord2i); + SET_TexCoord3d(dest, _mesa_TexCoord3d); + SET_TexCoord3i(dest, _mesa_TexCoord3i); + SET_TexCoord3s(dest, _mesa_TexCoord3s); + SET_TexCoord4d(dest, _mesa_TexCoord4d); + SET_TexCoord4i(dest, _mesa_TexCoord4i); + SET_TexCoord4s(dest, _mesa_TexCoord4s); + SET_TexCoord1dv(dest, _mesa_TexCoord1dv); + SET_TexCoord1iv(dest, _mesa_TexCoord1iv); + SET_TexCoord1sv(dest, _mesa_TexCoord1sv); + SET_TexCoord2dv(dest, _mesa_TexCoord2dv); + SET_TexCoord2iv(dest, _mesa_TexCoord2iv); + SET_TexCoord2sv(dest, _mesa_TexCoord2sv); + SET_TexCoord3dv(dest, _mesa_TexCoord3dv); + SET_TexCoord3iv(dest, _mesa_TexCoord3iv); + SET_TexCoord3sv(dest, _mesa_TexCoord3sv); + SET_TexCoord4dv(dest, _mesa_TexCoord4dv); + SET_TexCoord4iv(dest, _mesa_TexCoord4iv); + SET_TexCoord4sv(dest, _mesa_TexCoord4sv); + SET_Vertex2d(dest, _mesa_Vertex2d); + SET_Vertex2i(dest, _mesa_Vertex2i); + SET_Vertex2s(dest, _mesa_Vertex2s); + SET_Vertex3d(dest, _mesa_Vertex3d); + SET_Vertex3i(dest, _mesa_Vertex3i); + SET_Vertex3s(dest, _mesa_Vertex3s); + SET_Vertex4d(dest, _mesa_Vertex4d); + SET_Vertex4i(dest, _mesa_Vertex4i); + SET_Vertex4s(dest, _mesa_Vertex4s); + SET_Vertex2dv(dest, _mesa_Vertex2dv); + SET_Vertex2iv(dest, _mesa_Vertex2iv); + SET_Vertex2sv(dest, _mesa_Vertex2sv); + SET_Vertex3dv(dest, _mesa_Vertex3dv); + SET_Vertex3iv(dest, _mesa_Vertex3iv); + SET_Vertex3sv(dest, _mesa_Vertex3sv); + SET_Vertex4dv(dest, _mesa_Vertex4dv); + SET_Vertex4iv(dest, _mesa_Vertex4iv); + SET_Vertex4sv(dest, _mesa_Vertex4sv); + SET_MultiTexCoord1d(dest, _mesa_MultiTexCoord1d); + SET_MultiTexCoord1dv(dest, _mesa_MultiTexCoord1dv); + SET_MultiTexCoord1i(dest, _mesa_MultiTexCoord1i); + SET_MultiTexCoord1iv(dest, _mesa_MultiTexCoord1iv); + SET_MultiTexCoord1s(dest, _mesa_MultiTexCoord1s); + SET_MultiTexCoord1sv(dest, _mesa_MultiTexCoord1sv); + SET_MultiTexCoord2d(dest, _mesa_MultiTexCoord2d); + SET_MultiTexCoord2dv(dest, _mesa_MultiTexCoord2dv); + SET_MultiTexCoord2i(dest, _mesa_MultiTexCoord2i); + SET_MultiTexCoord2iv(dest, _mesa_MultiTexCoord2iv); + SET_MultiTexCoord2s(dest, _mesa_MultiTexCoord2s); + SET_MultiTexCoord2sv(dest, _mesa_MultiTexCoord2sv); + SET_MultiTexCoord3d(dest, _mesa_MultiTexCoord3d); + SET_MultiTexCoord3dv(dest, _mesa_MultiTexCoord3dv); + SET_MultiTexCoord3i(dest, _mesa_MultiTexCoord3i); + SET_MultiTexCoord3iv(dest, _mesa_MultiTexCoord3iv); + SET_MultiTexCoord3s(dest, _mesa_MultiTexCoord3s); + SET_MultiTexCoord3sv(dest, _mesa_MultiTexCoord3sv); + SET_MultiTexCoord4d(dest, _mesa_MultiTexCoord4d); + SET_MultiTexCoord4dv(dest, _mesa_MultiTexCoord4dv); + SET_MultiTexCoord4i(dest, _mesa_MultiTexCoord4i); + SET_MultiTexCoord4iv(dest, _mesa_MultiTexCoord4iv); + SET_MultiTexCoord4s(dest, _mesa_MultiTexCoord4s); + SET_MultiTexCoord4sv(dest, _mesa_MultiTexCoord4sv); + SET_EvalCoord2dv(dest, _mesa_EvalCoord2dv); + SET_EvalCoord2fv(dest, _mesa_EvalCoord2fv); + SET_EvalCoord2d(dest, _mesa_EvalCoord2d); + SET_EvalCoord1dv(dest, _mesa_EvalCoord1dv); + SET_EvalCoord1fv(dest, _mesa_EvalCoord1fv); + SET_EvalCoord1d(dest, _mesa_EvalCoord1d); + SET_Materiali(dest, _mesa_Materiali); + SET_Materialiv(dest, _mesa_Materialiv); + SET_Rectd(dest, _mesa_Rectd); + SET_Rectdv(dest, _mesa_Rectdv); + SET_Rectfv(dest, _mesa_Rectfv); + SET_Recti(dest, _mesa_Recti); + SET_Rectiv(dest, _mesa_Rectiv); + SET_Rects(dest, _mesa_Rects); + SET_Rectsv(dest, _mesa_Rectsv); + SET_FogCoordd(dest, _mesa_FogCoordd); + SET_FogCoorddv(dest, _mesa_FogCoorddv); } if (ctx->API == API_OPENGL) { - SET_VertexAttrib1sNV(dest, loopback_VertexAttrib1sNV); - SET_VertexAttrib1dNV(dest, loopback_VertexAttrib1dNV); - SET_VertexAttrib2sNV(dest, loopback_VertexAttrib2sNV); - SET_VertexAttrib2dNV(dest, loopback_VertexAttrib2dNV); - SET_VertexAttrib3sNV(dest, loopback_VertexAttrib3sNV); - SET_VertexAttrib3dNV(dest, loopback_VertexAttrib3dNV); - SET_VertexAttrib4sNV(dest, loopback_VertexAttrib4sNV); - SET_VertexAttrib4dNV(dest, loopback_VertexAttrib4dNV); - SET_VertexAttrib4ubNV(dest, loopback_VertexAttrib4ubNV); - SET_VertexAttrib1svNV(dest, loopback_VertexAttrib1svNV); - SET_VertexAttrib1dvNV(dest, loopback_VertexAttrib1dvNV); - SET_VertexAttrib2svNV(dest, loopback_VertexAttrib2svNV); - SET_VertexAttrib2dvNV(dest, loopback_VertexAttrib2dvNV); - SET_VertexAttrib3svNV(dest, loopback_VertexAttrib3svNV); - SET_VertexAttrib3dvNV(dest, loopback_VertexAttrib3dvNV); - SET_VertexAttrib4svNV(dest, loopback_VertexAttrib4svNV); - SET_VertexAttrib4dvNV(dest, loopback_VertexAttrib4dvNV); - SET_VertexAttrib4ubvNV(dest, loopback_VertexAttrib4ubvNV); - SET_VertexAttribs1svNV(dest, loopback_VertexAttribs1svNV); - SET_VertexAttribs1fvNV(dest, loopback_VertexAttribs1fvNV); - SET_VertexAttribs1dvNV(dest, loopback_VertexAttribs1dvNV); - SET_VertexAttribs2svNV(dest, loopback_VertexAttribs2svNV); - SET_VertexAttribs2fvNV(dest, loopback_VertexAttribs2fvNV); - SET_VertexAttribs2dvNV(dest, loopback_VertexAttribs2dvNV); - SET_VertexAttribs3svNV(dest, loopback_VertexAttribs3svNV); - SET_VertexAttribs3fvNV(dest, loopback_VertexAttribs3fvNV); - SET_VertexAttribs3dvNV(dest, loopback_VertexAttribs3dvNV); - SET_VertexAttribs4svNV(dest, loopback_VertexAttribs4svNV); - SET_VertexAttribs4fvNV(dest, loopback_VertexAttribs4fvNV); - SET_VertexAttribs4dvNV(dest, loopback_VertexAttribs4dvNV); - SET_VertexAttribs4ubvNV(dest, loopback_VertexAttribs4ubvNV); + SET_VertexAttrib1sNV(dest, _mesa_VertexAttrib1sNV); + SET_VertexAttrib1dNV(dest, _mesa_VertexAttrib1dNV); + SET_VertexAttrib2sNV(dest, _mesa_VertexAttrib2sNV); + SET_VertexAttrib2dNV(dest, _mesa_VertexAttrib2dNV); + SET_VertexAttrib3sNV(dest, _mesa_VertexAttrib3sNV); + SET_VertexAttrib3dNV(dest, _mesa_VertexAttrib3dNV); + SET_VertexAttrib4sNV(dest, _mesa_VertexAttrib4sNV); + SET_VertexAttrib4dNV(dest, _mesa_VertexAttrib4dNV); + SET_VertexAttrib4ubNV(dest, _mesa_VertexAttrib4ubNV); + SET_VertexAttrib1svNV(dest, _mesa_VertexAttrib1svNV); + SET_VertexAttrib1dvNV(dest, _mesa_VertexAttrib1dvNV); + SET_VertexAttrib2svNV(dest, _mesa_VertexAttrib2svNV); + SET_VertexAttrib2dvNV(dest, _mesa_VertexAttrib2dvNV); + SET_VertexAttrib3svNV(dest, _mesa_VertexAttrib3svNV); + SET_VertexAttrib3dvNV(dest, _mesa_VertexAttrib3dvNV); + SET_VertexAttrib4svNV(dest, _mesa_VertexAttrib4svNV); + SET_VertexAttrib4dvNV(dest, _mesa_VertexAttrib4dvNV); + SET_VertexAttrib4ubvNV(dest, _mesa_VertexAttrib4ubvNV); + SET_VertexAttribs1svNV(dest, _mesa_VertexAttribs1svNV); + SET_VertexAttribs1fvNV(dest, _mesa_VertexAttribs1fvNV); + SET_VertexAttribs1dvNV(dest, _mesa_VertexAttribs1dvNV); + SET_VertexAttribs2svNV(dest, _mesa_VertexAttribs2svNV); + SET_VertexAttribs2fvNV(dest, _mesa_VertexAttribs2fvNV); + SET_VertexAttribs2dvNV(dest, _mesa_VertexAttribs2dvNV); + SET_VertexAttribs3svNV(dest, _mesa_VertexAttribs3svNV); + SET_VertexAttribs3fvNV(dest, _mesa_VertexAttribs3fvNV); + SET_VertexAttribs3dvNV(dest, _mesa_VertexAttribs3dvNV); + SET_VertexAttribs4svNV(dest, _mesa_VertexAttribs4svNV); + SET_VertexAttribs4fvNV(dest, _mesa_VertexAttribs4fvNV); + SET_VertexAttribs4dvNV(dest, _mesa_VertexAttribs4dvNV); + SET_VertexAttribs4ubvNV(dest, _mesa_VertexAttribs4ubvNV); } if (_mesa_is_desktop_gl(ctx)) { - SET_VertexAttrib1sARB(dest, loopback_VertexAttrib1sARB); - SET_VertexAttrib1dARB(dest, loopback_VertexAttrib1dARB); - SET_VertexAttrib2sARB(dest, loopback_VertexAttrib2sARB); - SET_VertexAttrib2dARB(dest, loopback_VertexAttrib2dARB); - SET_VertexAttrib3sARB(dest, loopback_VertexAttrib3sARB); - SET_VertexAttrib3dARB(dest, loopback_VertexAttrib3dARB); - SET_VertexAttrib4sARB(dest, loopback_VertexAttrib4sARB); - SET_VertexAttrib4dARB(dest, loopback_VertexAttrib4dARB); - SET_VertexAttrib1svARB(dest, loopback_VertexAttrib1svARB); - SET_VertexAttrib1dvARB(dest, loopback_VertexAttrib1dvARB); - SET_VertexAttrib2svARB(dest, loopback_VertexAttrib2svARB); - SET_VertexAttrib2dvARB(dest, loopback_VertexAttrib2dvARB); - SET_VertexAttrib3svARB(dest, loopback_VertexAttrib3svARB); - SET_VertexAttrib3dvARB(dest, loopback_VertexAttrib3dvARB); - SET_VertexAttrib4svARB(dest, loopback_VertexAttrib4svARB); - SET_VertexAttrib4dvARB(dest, loopback_VertexAttrib4dvARB); - SET_VertexAttrib4NubARB(dest, loopback_VertexAttrib4NubARB); - SET_VertexAttrib4NubvARB(dest, loopback_VertexAttrib4NubvARB); - SET_VertexAttrib4bvARB(dest, loopback_VertexAttrib4bvARB); - SET_VertexAttrib4ivARB(dest, loopback_VertexAttrib4ivARB); - SET_VertexAttrib4ubvARB(dest, loopback_VertexAttrib4ubvARB); - SET_VertexAttrib4usvARB(dest, loopback_VertexAttrib4usvARB); - SET_VertexAttrib4uivARB(dest, loopback_VertexAttrib4uivARB); - SET_VertexAttrib4NbvARB(dest, loopback_VertexAttrib4NbvARB); - SET_VertexAttrib4NsvARB(dest, loopback_VertexAttrib4NsvARB); - SET_VertexAttrib4NusvARB(dest, loopback_VertexAttrib4NusvARB); - SET_VertexAttrib4NivARB(dest, loopback_VertexAttrib4NivARB); - SET_VertexAttrib4NuivARB(dest, loopback_VertexAttrib4NuivARB); + SET_VertexAttrib1s(dest, _mesa_VertexAttrib1s); + SET_VertexAttrib1d(dest, _mesa_VertexAttrib1d); + SET_VertexAttrib2s(dest, _mesa_VertexAttrib2s); + SET_VertexAttrib2d(dest, _mesa_VertexAttrib2d); + SET_VertexAttrib3s(dest, _mesa_VertexAttrib3s); + SET_VertexAttrib3d(dest, _mesa_VertexAttrib3d); + SET_VertexAttrib4s(dest, _mesa_VertexAttrib4s); + SET_VertexAttrib4d(dest, _mesa_VertexAttrib4d); + SET_VertexAttrib1sv(dest, _mesa_VertexAttrib1sv); + SET_VertexAttrib1dv(dest, _mesa_VertexAttrib1dv); + SET_VertexAttrib2sv(dest, _mesa_VertexAttrib2sv); + SET_VertexAttrib2dv(dest, _mesa_VertexAttrib2dv); + SET_VertexAttrib3sv(dest, _mesa_VertexAttrib3sv); + SET_VertexAttrib3dv(dest, _mesa_VertexAttrib3dv); + SET_VertexAttrib4sv(dest, _mesa_VertexAttrib4sv); + SET_VertexAttrib4dv(dest, _mesa_VertexAttrib4dv); + SET_VertexAttrib4Nub(dest, _mesa_VertexAttrib4Nub); + SET_VertexAttrib4Nubv(dest, _mesa_VertexAttrib4Nubv); + SET_VertexAttrib4bv(dest, _mesa_VertexAttrib4bv); + SET_VertexAttrib4iv(dest, _mesa_VertexAttrib4iv); + SET_VertexAttrib4ubv(dest, _mesa_VertexAttrib4ubv); + SET_VertexAttrib4usv(dest, _mesa_VertexAttrib4usv); + SET_VertexAttrib4uiv(dest, _mesa_VertexAttrib4uiv); + SET_VertexAttrib4Nbv(dest, _mesa_VertexAttrib4Nbv); + SET_VertexAttrib4Nsv(dest, _mesa_VertexAttrib4Nsv); + SET_VertexAttrib4Nusv(dest, _mesa_VertexAttrib4Nusv); + SET_VertexAttrib4Niv(dest, _mesa_VertexAttrib4Niv); + SET_VertexAttrib4Nuiv(dest, _mesa_VertexAttrib4Nuiv); /* GL_EXT_gpu_shader4, GL 3.0 */ - SET_VertexAttribI1ivEXT(dest, loopback_VertexAttribI1iv); - SET_VertexAttribI1uivEXT(dest, loopback_VertexAttribI1uiv); - SET_VertexAttribI4bvEXT(dest, loopback_VertexAttribI4bv); - SET_VertexAttribI4svEXT(dest, loopback_VertexAttribI4sv); - SET_VertexAttribI4ubvEXT(dest, loopback_VertexAttribI4ubv); - SET_VertexAttribI4usvEXT(dest, loopback_VertexAttribI4usv); + SET_VertexAttribI1iv(dest, _mesa_VertexAttribI1iv); + SET_VertexAttribI1uiv(dest, _mesa_VertexAttribI1uiv); + SET_VertexAttribI4bv(dest, _mesa_VertexAttribI4bv); + SET_VertexAttribI4sv(dest, _mesa_VertexAttribI4sv); + SET_VertexAttribI4ubv(dest, _mesa_VertexAttribI4ubv); + SET_VertexAttribI4usv(dest, _mesa_VertexAttribI4usv); } } diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h index 879ad89956c..c35d57bffe9 100644 --- a/src/mesa/main/api_loopback.h +++ b/src/mesa/main/api_loopback.h @@ -45,433 +45,433 @@ extern void _mesa_loopback_init_api_table(const struct gl_context *ctx, struct _glapi_table *dest); void GLAPIENTRY -loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ); +_mesa_Color3b( GLbyte red, GLbyte green, GLbyte blue ); void GLAPIENTRY -loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue ); +_mesa_Color3d( GLdouble red, GLdouble green, GLdouble blue ); void GLAPIENTRY -loopback_Color3i_f( GLint red, GLint green, GLint blue ); +_mesa_Color3i( GLint red, GLint green, GLint blue ); void GLAPIENTRY -loopback_Color3s_f( GLshort red, GLshort green, GLshort blue ); +_mesa_Color3s( GLshort red, GLshort green, GLshort blue ); void GLAPIENTRY -loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue ); +_mesa_Color3ui( GLuint red, GLuint green, GLuint blue ); void GLAPIENTRY -loopback_Color3us_f( GLushort red, GLushort green, GLushort blue ); +_mesa_Color3us( GLushort red, GLushort green, GLushort blue ); void GLAPIENTRY -loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue ); +_mesa_Color3ub( GLubyte red, GLubyte green, GLubyte blue ); void GLAPIENTRY -loopback_Color3bv_f( const GLbyte *v ); +_mesa_Color3bv( const GLbyte *v ); void GLAPIENTRY -loopback_Color3dv_f( const GLdouble *v ); +_mesa_Color3dv( const GLdouble *v ); void GLAPIENTRY -loopback_Color3iv_f( const GLint *v ); +_mesa_Color3iv( const GLint *v ); void GLAPIENTRY -loopback_Color3sv_f( const GLshort *v ); +_mesa_Color3sv( const GLshort *v ); void GLAPIENTRY -loopback_Color3uiv_f( const GLuint *v ); +_mesa_Color3uiv( const GLuint *v ); void GLAPIENTRY -loopback_Color3usv_f( const GLushort *v ); +_mesa_Color3usv( const GLushort *v ); void GLAPIENTRY -loopback_Color3ubv_f( const GLubyte *v ); +_mesa_Color3ubv( const GLubyte *v ); void GLAPIENTRY -loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, +_mesa_Color4b( GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha ); void GLAPIENTRY -loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue, +_mesa_Color4d( GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha ); void GLAPIENTRY -loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha ); +_mesa_Color4i( GLint red, GLint green, GLint blue, GLint alpha ); void GLAPIENTRY -loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, +_mesa_Color4s( GLshort red, GLshort green, GLshort blue, GLshort alpha ); void GLAPIENTRY -loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha ); +_mesa_Color4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha ); void GLAPIENTRY -loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, +_mesa_Color4us( GLushort red, GLushort green, GLushort blue, GLushort alpha ); void GLAPIENTRY -loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ); +_mesa_Color4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ); void GLAPIENTRY -loopback_Color4iv_f( const GLint *v ); +_mesa_Color4iv( const GLint *v ); void GLAPIENTRY -loopback_Color4bv_f( const GLbyte *v ); +_mesa_Color4bv( const GLbyte *v ); void GLAPIENTRY -loopback_Color4dv_f( const GLdouble *v ); +_mesa_Color4dv( const GLdouble *v ); void GLAPIENTRY -loopback_Color4sv_f( const GLshort *v); +_mesa_Color4sv( const GLshort *v); void GLAPIENTRY -loopback_Color4uiv_f( const GLuint *v); +_mesa_Color4uiv( const GLuint *v); void GLAPIENTRY -loopback_Color4usv_f( const GLushort *v); +_mesa_Color4usv( const GLushort *v); void GLAPIENTRY -loopback_Color4ubv_f( const GLubyte *v); +_mesa_Color4ubv( const GLubyte *v); void GLAPIENTRY -loopback_FogCoorddEXT( GLdouble d ); +_mesa_FogCoordd( GLdouble d ); void GLAPIENTRY -loopback_FogCoorddvEXT( const GLdouble *v ); +_mesa_FogCoorddv( const GLdouble *v ); void GLAPIENTRY -loopback_Indexd( GLdouble c ); +_mesa_Indexd( GLdouble c ); void GLAPIENTRY -loopback_Indexi( GLint c ); +_mesa_Indexi( GLint c ); void GLAPIENTRY -loopback_Indexs( GLshort c ); +_mesa_Indexs( GLshort c ); void GLAPIENTRY -loopback_Indexub( GLubyte c ); +_mesa_Indexub( GLubyte c ); void GLAPIENTRY -loopback_Indexdv( const GLdouble *c ); +_mesa_Indexdv( const GLdouble *c ); void GLAPIENTRY -loopback_Indexiv( const GLint *c ); +_mesa_Indexiv( const GLint *c ); void GLAPIENTRY -loopback_Indexsv( const GLshort *c ); +_mesa_Indexsv( const GLshort *c ); void GLAPIENTRY -loopback_Indexubv( const GLubyte *c ); +_mesa_Indexubv( const GLubyte *c ); void GLAPIENTRY -loopback_EdgeFlagv(const GLboolean *flag); +_mesa_EdgeFlagv(const GLboolean *flag); void GLAPIENTRY -loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz ); +_mesa_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz ); void GLAPIENTRY -loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz ); +_mesa_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz ); void GLAPIENTRY -loopback_Normal3i( GLint nx, GLint ny, GLint nz ); +_mesa_Normal3i( GLint nx, GLint ny, GLint nz ); void GLAPIENTRY -loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz ); +_mesa_Normal3s( GLshort nx, GLshort ny, GLshort nz ); void GLAPIENTRY -loopback_Normal3bv( const GLbyte *v ); +_mesa_Normal3bv( const GLbyte *v ); void GLAPIENTRY -loopback_Normal3dv( const GLdouble *v ); +_mesa_Normal3dv( const GLdouble *v ); void GLAPIENTRY -loopback_Normal3iv( const GLint *v ); +_mesa_Normal3iv( const GLint *v ); void GLAPIENTRY -loopback_Normal3sv( const GLshort *v ); +_mesa_Normal3sv( const GLshort *v ); void GLAPIENTRY -loopback_TexCoord1d( GLdouble s ); +_mesa_TexCoord1d( GLdouble s ); void GLAPIENTRY -loopback_TexCoord1i( GLint s ); +_mesa_TexCoord1i( GLint s ); void GLAPIENTRY -loopback_TexCoord1s( GLshort s ); +_mesa_TexCoord1s( GLshort s ); void GLAPIENTRY -loopback_TexCoord2d( GLdouble s, GLdouble t ); +_mesa_TexCoord2d( GLdouble s, GLdouble t ); void GLAPIENTRY -loopback_TexCoord2s( GLshort s, GLshort t ); +_mesa_TexCoord2s( GLshort s, GLshort t ); void GLAPIENTRY -loopback_TexCoord2i( GLint s, GLint t ); +_mesa_TexCoord2i( GLint s, GLint t ); void GLAPIENTRY -loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r ); +_mesa_TexCoord3d( GLdouble s, GLdouble t, GLdouble r ); void GLAPIENTRY -loopback_TexCoord3i( GLint s, GLint t, GLint r ); +_mesa_TexCoord3i( GLint s, GLint t, GLint r ); void GLAPIENTRY -loopback_TexCoord3s( GLshort s, GLshort t, GLshort r ); +_mesa_TexCoord3s( GLshort s, GLshort t, GLshort r ); void GLAPIENTRY -loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ); +_mesa_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ); void GLAPIENTRY -loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q ); +_mesa_TexCoord4i( GLint s, GLint t, GLint r, GLint q ); void GLAPIENTRY -loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ); +_mesa_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ); void GLAPIENTRY -loopback_TexCoord1dv( const GLdouble *v ); +_mesa_TexCoord1dv( const GLdouble *v ); void GLAPIENTRY -loopback_TexCoord1iv( const GLint *v ); +_mesa_TexCoord1iv( const GLint *v ); void GLAPIENTRY -loopback_TexCoord1sv( const GLshort *v ); +_mesa_TexCoord1sv( const GLshort *v ); void GLAPIENTRY -loopback_TexCoord2dv( const GLdouble *v ); +_mesa_TexCoord2dv( const GLdouble *v ); void GLAPIENTRY -loopback_TexCoord2iv( const GLint *v ); +_mesa_TexCoord2iv( const GLint *v ); void GLAPIENTRY -loopback_TexCoord2sv( const GLshort *v ); +_mesa_TexCoord2sv( const GLshort *v ); void GLAPIENTRY -loopback_TexCoord3dv( const GLdouble *v ); +_mesa_TexCoord3dv( const GLdouble *v ); void GLAPIENTRY -loopback_TexCoord3iv( const GLint *v ); +_mesa_TexCoord3iv( const GLint *v ); void GLAPIENTRY -loopback_TexCoord3sv( const GLshort *v ); +_mesa_TexCoord3sv( const GLshort *v ); void GLAPIENTRY -loopback_TexCoord4dv( const GLdouble *v ); +_mesa_TexCoord4dv( const GLdouble *v ); void GLAPIENTRY -loopback_TexCoord4iv( const GLint *v ); +_mesa_TexCoord4iv( const GLint *v ); void GLAPIENTRY -loopback_TexCoord4sv( const GLshort *v ); +_mesa_TexCoord4sv( const GLshort *v ); void GLAPIENTRY -loopback_Vertex2d( GLdouble x, GLdouble y ); +_mesa_Vertex2d( GLdouble x, GLdouble y ); void GLAPIENTRY -loopback_Vertex2i( GLint x, GLint y ); +_mesa_Vertex2i( GLint x, GLint y ); void GLAPIENTRY -loopback_Vertex2s( GLshort x, GLshort y ); +_mesa_Vertex2s( GLshort x, GLshort y ); void GLAPIENTRY -loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z ); +_mesa_Vertex3d( GLdouble x, GLdouble y, GLdouble z ); void GLAPIENTRY -loopback_Vertex3i( GLint x, GLint y, GLint z ); +_mesa_Vertex3i( GLint x, GLint y, GLint z ); void GLAPIENTRY -loopback_Vertex3s( GLshort x, GLshort y, GLshort z ); +_mesa_Vertex3s( GLshort x, GLshort y, GLshort z ); void GLAPIENTRY -loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ); +_mesa_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ); void GLAPIENTRY -loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w ); +_mesa_Vertex4i( GLint x, GLint y, GLint z, GLint w ); void GLAPIENTRY -loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w ); +_mesa_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w ); void GLAPIENTRY -loopback_Vertex2dv( const GLdouble *v ); +_mesa_Vertex2dv( const GLdouble *v ); void GLAPIENTRY -loopback_Vertex2iv( const GLint *v ); +_mesa_Vertex2iv( const GLint *v ); void GLAPIENTRY -loopback_Vertex2sv( const GLshort *v ); +_mesa_Vertex2sv( const GLshort *v ); void GLAPIENTRY -loopback_Vertex3dv( const GLdouble *v ); +_mesa_Vertex3dv( const GLdouble *v ); void GLAPIENTRY -loopback_Vertex3iv( const GLint *v ); +_mesa_Vertex3iv( const GLint *v ); void GLAPIENTRY -loopback_Vertex3sv( const GLshort *v ); +_mesa_Vertex3sv( const GLshort *v ); void GLAPIENTRY -loopback_Vertex4dv( const GLdouble *v ); +_mesa_Vertex4dv( const GLdouble *v ); void GLAPIENTRY -loopback_Vertex4iv( const GLint *v ); +_mesa_Vertex4iv( const GLint *v ); void GLAPIENTRY -loopback_Vertex4sv( const GLshort *v ); +_mesa_Vertex4sv( const GLshort *v ); void GLAPIENTRY -loopback_MultiTexCoord1dARB(GLenum target, GLdouble s); +_mesa_MultiTexCoord1d(GLenum target, GLdouble s); void GLAPIENTRY -loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v); +_mesa_MultiTexCoord1dv(GLenum target, const GLdouble *v); void GLAPIENTRY -loopback_MultiTexCoord1iARB(GLenum target, GLint s); +_mesa_MultiTexCoord1i(GLenum target, GLint s); void GLAPIENTRY -loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v); +_mesa_MultiTexCoord1iv(GLenum target, const GLint *v); void GLAPIENTRY -loopback_MultiTexCoord1sARB(GLenum target, GLshort s); +_mesa_MultiTexCoord1s(GLenum target, GLshort s); void GLAPIENTRY -loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v); +_mesa_MultiTexCoord1sv(GLenum target, const GLshort *v); void GLAPIENTRY -loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t); +_mesa_MultiTexCoord2d(GLenum target, GLdouble s, GLdouble t); void GLAPIENTRY -loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v); +_mesa_MultiTexCoord2dv(GLenum target, const GLdouble *v); void GLAPIENTRY -loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t); +_mesa_MultiTexCoord2i(GLenum target, GLint s, GLint t); void GLAPIENTRY -loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v); +_mesa_MultiTexCoord2iv(GLenum target, const GLint *v); void GLAPIENTRY -loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t); +_mesa_MultiTexCoord2s(GLenum target, GLshort s, GLshort t); void GLAPIENTRY -loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v); +_mesa_MultiTexCoord2sv(GLenum target, const GLshort *v); void GLAPIENTRY -loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r); +_mesa_MultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r); void GLAPIENTRY -loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v); +_mesa_MultiTexCoord3dv(GLenum target, const GLdouble *v); void GLAPIENTRY -loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r); +_mesa_MultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r); void GLAPIENTRY -loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v); +_mesa_MultiTexCoord3iv(GLenum target, const GLint *v); void GLAPIENTRY -loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r); +_mesa_MultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r); void GLAPIENTRY -loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v); +_mesa_MultiTexCoord3sv(GLenum target, const GLshort *v); void GLAPIENTRY -loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, +_mesa_MultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); void GLAPIENTRY -loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v); +_mesa_MultiTexCoord4dv(GLenum target, const GLdouble *v); void GLAPIENTRY -loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q); +_mesa_MultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q); void GLAPIENTRY -loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v); +_mesa_MultiTexCoord4iv(GLenum target, const GLint *v); void GLAPIENTRY -loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, +_mesa_MultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); void GLAPIENTRY -loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v); +_mesa_MultiTexCoord4sv(GLenum target, const GLshort *v); void GLAPIENTRY -loopback_EvalCoord2dv( const GLdouble *u ); +_mesa_EvalCoord2dv( const GLdouble *u ); void GLAPIENTRY -loopback_EvalCoord2fv( const GLfloat *u ); +_mesa_EvalCoord2fv( const GLfloat *u ); void GLAPIENTRY -loopback_EvalCoord2d( GLdouble u, GLdouble v ); +_mesa_EvalCoord2d( GLdouble u, GLdouble v ); void GLAPIENTRY -loopback_EvalCoord1dv( const GLdouble *u ); +_mesa_EvalCoord1dv( const GLdouble *u ); void GLAPIENTRY -loopback_EvalCoord1fv( const GLfloat *u ); +_mesa_EvalCoord1fv( const GLfloat *u ); void GLAPIENTRY -loopback_EvalCoord1d( GLdouble u ); +_mesa_EvalCoord1d( GLdouble u ); void GLAPIENTRY -loopback_Materialf( GLenum face, GLenum pname, GLfloat param ); +_mesa_Materialf( GLenum face, GLenum pname, GLfloat param ); void GLAPIENTRY -loopback_Materiali(GLenum face, GLenum pname, GLint param ); +_mesa_Materiali(GLenum face, GLenum pname, GLint param ); void GLAPIENTRY -loopback_Materialiv(GLenum face, GLenum pname, const GLint *params ); +_mesa_Materialiv(GLenum face, GLenum pname, const GLint *params ); void GLAPIENTRY -loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); +_mesa_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); void GLAPIENTRY -loopback_Rectdv(const GLdouble *v1, const GLdouble *v2); +_mesa_Rectdv(const GLdouble *v1, const GLdouble *v2); void GLAPIENTRY -loopback_Rectfv(const GLfloat *v1, const GLfloat *v2); +_mesa_Rectfv(const GLfloat *v1, const GLfloat *v2); void GLAPIENTRY -loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2); +_mesa_Recti(GLint x1, GLint y1, GLint x2, GLint y2); void GLAPIENTRY -loopback_Rectiv(const GLint *v1, const GLint *v2); +_mesa_Rectiv(const GLint *v1, const GLint *v2); void GLAPIENTRY -loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2); +_mesa_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2); void GLAPIENTRY -loopback_Rectsv(const GLshort *v1, const GLshort *v2); +_mesa_Rectsv(const GLshort *v1, const GLshort *v2); void GLAPIENTRY -loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue ); +_mesa_SecondaryColor3b( GLbyte red, GLbyte green, GLbyte blue ); void GLAPIENTRY -loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue ); +_mesa_SecondaryColor3d( GLdouble red, GLdouble green, GLdouble blue ); void GLAPIENTRY -loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue ); +_mesa_SecondaryColor3i( GLint red, GLint green, GLint blue ); void GLAPIENTRY -loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue ); +_mesa_SecondaryColor3s( GLshort red, GLshort green, GLshort blue ); void GLAPIENTRY -loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue ); +_mesa_SecondaryColor3ui( GLuint red, GLuint green, GLuint blue ); void GLAPIENTRY -loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue ); +_mesa_SecondaryColor3us( GLushort red, GLushort green, GLushort blue ); void GLAPIENTRY -loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue ); +_mesa_SecondaryColor3ub( GLubyte red, GLubyte green, GLubyte blue ); void GLAPIENTRY -loopback_SecondaryColor3bvEXT_f( const GLbyte *v ); +_mesa_SecondaryColor3bv( const GLbyte *v ); void GLAPIENTRY -loopback_SecondaryColor3dvEXT_f( const GLdouble *v ); +_mesa_SecondaryColor3dv( const GLdouble *v ); void GLAPIENTRY -loopback_SecondaryColor3ivEXT_f( const GLint *v ); +_mesa_SecondaryColor3iv( const GLint *v ); void GLAPIENTRY -loopback_SecondaryColor3svEXT_f( const GLshort *v ); +_mesa_SecondaryColor3sv( const GLshort *v ); void GLAPIENTRY -loopback_SecondaryColor3uivEXT_f( const GLuint *v ); +_mesa_SecondaryColor3uiv( const GLuint *v ); void GLAPIENTRY -loopback_SecondaryColor3usvEXT_f( const GLushort *v ); +_mesa_SecondaryColor3usv( const GLushort *v ); void GLAPIENTRY -loopback_SecondaryColor3ubvEXT_f( const GLubyte *v ); +_mesa_SecondaryColor3ubv( const GLubyte *v ); void GLAPIENTRY -loopback_VertexAttrib1sNV(GLuint index, GLshort x); +_mesa_VertexAttrib1sNV(GLuint index, GLshort x); void GLAPIENTRY -loopback_VertexAttrib1dNV(GLuint index, GLdouble x); +_mesa_VertexAttrib1dNV(GLuint index, GLdouble x); void GLAPIENTRY -loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y); +_mesa_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y); void GLAPIENTRY -loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y); +_mesa_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y); void GLAPIENTRY -loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z); +_mesa_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z); void GLAPIENTRY -loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z); +_mesa_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z); void GLAPIENTRY -loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, +_mesa_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); void GLAPIENTRY -loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, +_mesa_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); void GLAPIENTRY -loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, +_mesa_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); void GLAPIENTRY -loopback_VertexAttrib1svNV(GLuint index, const GLshort *v); +_mesa_VertexAttrib1svNV(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v); +_mesa_VertexAttrib1dvNV(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib2svNV(GLuint index, const GLshort *v); +_mesa_VertexAttrib2svNV(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v); +_mesa_VertexAttrib2dvNV(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib3svNV(GLuint index, const GLshort *v); +_mesa_VertexAttrib3svNV(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v); +_mesa_VertexAttrib3dvNV(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib4svNV(GLuint index, const GLshort *v); +_mesa_VertexAttrib4svNV(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v); +_mesa_VertexAttrib4dvNV(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v); +_mesa_VertexAttrib4ubvNV(GLuint index, const GLubyte *v); void GLAPIENTRY -loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v); +_mesa_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v); void GLAPIENTRY -loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v); +_mesa_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v); void GLAPIENTRY -loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v); +_mesa_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v); +_mesa_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v); void GLAPIENTRY -loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v); +_mesa_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v); void GLAPIENTRY -loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v); +_mesa_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v); +_mesa_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v); void GLAPIENTRY -loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v); +_mesa_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v); void GLAPIENTRY -loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v); +_mesa_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v); +_mesa_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v); void GLAPIENTRY -loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v); +_mesa_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v); void GLAPIENTRY -loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v); +_mesa_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v); +_mesa_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v); void GLAPIENTRY -loopback_VertexAttrib1sARB(GLuint index, GLshort x); +_mesa_VertexAttrib1s(GLuint index, GLshort x); void GLAPIENTRY -loopback_VertexAttrib1dARB(GLuint index, GLdouble x); +_mesa_VertexAttrib1d(GLuint index, GLdouble x); void GLAPIENTRY -loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y); +_mesa_VertexAttrib2s(GLuint index, GLshort x, GLshort y); void GLAPIENTRY -loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y); +_mesa_VertexAttrib2d(GLuint index, GLdouble x, GLdouble y); void GLAPIENTRY -loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z); +_mesa_VertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z); void GLAPIENTRY -loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z); +_mesa_VertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z); void GLAPIENTRY -loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, +_mesa_VertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); void GLAPIENTRY -loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, +_mesa_VertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); void GLAPIENTRY -loopback_VertexAttrib1svARB(GLuint index, const GLshort *v); +_mesa_VertexAttrib1sv(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v); +_mesa_VertexAttrib1dv(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib2svARB(GLuint index, const GLshort *v); +_mesa_VertexAttrib2sv(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v); +_mesa_VertexAttrib2dv(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib3svARB(GLuint index, const GLshort *v); +_mesa_VertexAttrib3sv(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v); +_mesa_VertexAttrib3dv(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib4svARB(GLuint index, const GLshort *v); +_mesa_VertexAttrib4sv(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v); +_mesa_VertexAttrib4dv(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v); +_mesa_VertexAttrib4bv(GLuint index, const GLbyte * v); void GLAPIENTRY -loopback_VertexAttrib4ivARB(GLuint index, const GLint * v); +_mesa_VertexAttrib4iv(GLuint index, const GLint * v); void GLAPIENTRY -loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v); +_mesa_VertexAttrib4ubv(GLuint index, const GLubyte * v); void GLAPIENTRY -loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v); +_mesa_VertexAttrib4usv(GLuint index, const GLushort * v); void GLAPIENTRY -loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v); +_mesa_VertexAttrib4uiv(GLuint index, const GLuint * v); void GLAPIENTRY -loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v); +_mesa_VertexAttrib4Nbv(GLuint index, const GLbyte * v); void GLAPIENTRY -loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v); +_mesa_VertexAttrib4Nsv(GLuint index, const GLshort * v); void GLAPIENTRY -loopback_VertexAttrib4NivARB(GLuint index, const GLint * v); +_mesa_VertexAttrib4Niv(GLuint index, const GLint * v); void GLAPIENTRY -loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, +_mesa_VertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); void GLAPIENTRY -loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v); +_mesa_VertexAttrib4Nubv(GLuint index, const GLubyte * v); void GLAPIENTRY -loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v); +_mesa_VertexAttrib4Nusv(GLuint index, const GLushort * v); void GLAPIENTRY -loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v); +_mesa_VertexAttrib4Nuiv(GLuint index, const GLuint * v); void GLAPIENTRY -loopback_VertexAttribI1iv(GLuint index, const GLint *v); +_mesa_VertexAttribI1iv(GLuint index, const GLint *v); void GLAPIENTRY -loopback_VertexAttribI1uiv(GLuint index, const GLuint *v); +_mesa_VertexAttribI1uiv(GLuint index, const GLuint *v); void GLAPIENTRY -loopback_VertexAttribI4bv(GLuint index, const GLbyte *v); +_mesa_VertexAttribI4bv(GLuint index, const GLbyte *v); void GLAPIENTRY -loopback_VertexAttribI4sv(GLuint index, const GLshort *v); +_mesa_VertexAttribI4sv(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v); +_mesa_VertexAttribI4ubv(GLuint index, const GLubyte *v); void GLAPIENTRY -loopback_VertexAttribI4usv(GLuint index, const GLushort *v); +_mesa_VertexAttribI4usv(GLuint index, const GLushort *v); #endif /* API_LOOPBACK_H */ diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c index 9be86c2febc..8150b5f4ec1 100644 --- a/src/mesa/main/arbprogram.c +++ b/src/mesa/main/arbprogram.c @@ -46,7 +46,7 @@ * and glBindProgramARB. */ void GLAPIENTRY -_mesa_BindProgram(GLenum target, GLuint id) +_mesa_BindProgramARB(GLenum target, GLuint id) { struct gl_program *curProg, *newProg; GET_CURRENT_CONTEXT(ctx); @@ -132,7 +132,7 @@ _mesa_BindProgram(GLenum target, GLuint id) * \note Called by both glDeleteProgramsNV and glDeleteProgramsARB. */ void GLAPIENTRY -_mesa_DeletePrograms(GLsizei n, const GLuint *ids) +_mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids) { GLint i; GET_CURRENT_CONTEXT(ctx); @@ -156,14 +156,14 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids) if (ctx->VertexProgram.Current && ctx->VertexProgram.Current->Base.Id == ids[i]) { /* unbind this currently bound program */ - _mesa_BindProgram(prog->Target, 0); + _mesa_BindProgramARB(prog->Target, 0); } break; case GL_FRAGMENT_PROGRAM_ARB: if (ctx->FragmentProgram.Current && ctx->FragmentProgram.Current->Base.Id == ids[i]) { /* unbind this currently bound program */ - _mesa_BindProgram(prog->Target, 0); + _mesa_BindProgramARB(prog->Target, 0); } break; default: @@ -185,7 +185,7 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids) * \note Called by both glGenProgramsNV and glGenProgramsARB. */ void GLAPIENTRY -_mesa_GenPrograms(GLsizei n, GLuint *ids) +_mesa_GenProgramsARB(GLsizei n, GLuint *ids) { GLuint first; GLuint i; diff --git a/src/mesa/main/arbprogram.h b/src/mesa/main/arbprogram.h index e2e535e911e..4f40a70c591 100644 --- a/src/mesa/main/arbprogram.h +++ b/src/mesa/main/arbprogram.h @@ -31,13 +31,13 @@ extern void GLAPIENTRY -_mesa_BindProgram(GLenum target, GLuint id); +_mesa_BindProgramARB(GLenum target, GLuint id); extern void GLAPIENTRY -_mesa_DeletePrograms(GLsizei n, const GLuint *ids); +_mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids); extern void GLAPIENTRY -_mesa_GenPrograms(GLsizei n, GLuint *ids); +_mesa_GenProgramsARB(GLsizei n, GLuint *ids); extern GLboolean GLAPIENTRY diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index 926c753dd38..a909e0effaa 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -431,7 +431,7 @@ _mesa_BindVertexArrayAPPLE( GLuint id ) * \param ids Array of \c n array object IDs. */ void GLAPIENTRY -_mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids) +_mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids) { GET_CURRENT_CONTEXT(ctx); GLsizei i; @@ -541,7 +541,7 @@ _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays) * \c GL_FALSE otherwise. */ GLboolean GLAPIENTRY -_mesa_IsVertexArrayAPPLE( GLuint id ) +_mesa_IsVertexArray( GLuint id ) { struct gl_array_object * obj; GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h index dfefec2a7a3..0d58bb75ac2 100644 --- a/src/mesa/main/arrayobj.h +++ b/src/mesa/main/arrayobj.h @@ -110,12 +110,12 @@ void GLAPIENTRY _mesa_BindVertexArray( GLuint id ); void GLAPIENTRY _mesa_BindVertexArrayAPPLE( GLuint id ); -void GLAPIENTRY _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids); +void GLAPIENTRY _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids); void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays); void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer); -GLboolean GLAPIENTRY _mesa_IsVertexArrayAPPLE( GLuint id ); +GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id ); #endif /* ARRAYOBJ_H */ diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 0997e5407fa..acb33885ab0 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -618,7 +618,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable) const GLbitfield genEnabled = enable->TexGen[i]; if (ctx->Texture.Unit[i].Enabled != enabled) { - _mesa_ActiveTextureARB(GL_TEXTURE0 + i); + _mesa_ActiveTexture(GL_TEXTURE0 + i); _mesa_set_enable(ctx, GL_TEXTURE_1D, !!(enabled & TEXTURE_1D_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_2D, !!(enabled & TEXTURE_2D_BIT)); @@ -640,7 +640,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable) } if (ctx->Texture.Unit[i].TexGenEnabled != genEnabled) { - _mesa_ActiveTextureARB(GL_TEXTURE0 + i); + _mesa_ActiveTexture(GL_TEXTURE0 + i); _mesa_set_enable(ctx, GL_TEXTURE_GEN_S, !!(genEnabled & S_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_GEN_T, !!(genEnabled & T_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_GEN_R, !!(genEnabled & R_BIT)); @@ -648,7 +648,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable) } } - _mesa_ActiveTextureARB(GL_TEXTURE0 + curTexUnitSave); + _mesa_ActiveTexture(GL_TEXTURE0 + curTexUnitSave); } @@ -666,7 +666,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate) const struct gl_texture_unit *unit = &texstate->Texture.Unit[u]; GLuint tgt; - _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + u); + _mesa_ActiveTexture(GL_TEXTURE0_ARB + u); _mesa_set_enable(ctx, GL_TEXTURE_1D, !!(unit->Enabled & TEXTURE_1D_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_2D, !!(unit->Enabled & TEXTURE_2D_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_3D, !!(unit->Enabled & TEXTURE_3D_BIT)); @@ -808,7 +808,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate) } } - _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + texstate->Texture.CurrentUnit); + _mesa_ActiveTexture(GL_TEXTURE0_ARB + texstate->Texture.CurrentUnit); _mesa_reference_shared_state(ctx, &texstate->SharedRef, NULL); @@ -879,7 +879,7 @@ _mesa_PopAttrib(void) else { GLuint i; for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) { - _mesa_ColorMaskIndexed(i, + _mesa_ColorMaski(i, (GLboolean) (color->ColorMask[i][0] != 0), (GLboolean) (color->ColorMask[i][1] != 0), (GLboolean) (color->ColorMask[i][2] != 0), @@ -910,7 +910,7 @@ _mesa_PopAttrib(void) * to record that error. Per OpenGL ARB decision. */ if (multipleBuffers) - _mesa_DrawBuffersARB(ctx->Const.MaxDrawBuffers, + _mesa_DrawBuffers(ctx->Const.MaxDrawBuffers, color->DrawBuffer); else _mesa_DrawBuffer(color->DrawBuffer[0]); @@ -934,18 +934,18 @@ _mesa_PopAttrib(void) /* set blend per buffer */ GLuint buf; for (buf = 0; buf < ctx->Const.MaxDrawBuffers; buf++) { - _mesa_BlendFuncSeparatei(buf, color->Blend[buf].SrcRGB, + _mesa_BlendFuncSeparateiARB(buf, color->Blend[buf].SrcRGB, color->Blend[buf].DstRGB, color->Blend[buf].SrcA, color->Blend[buf].DstA); - _mesa_BlendEquationSeparatei(buf, + _mesa_BlendEquationSeparateiARB(buf, color->Blend[buf].EquationRGB, color->Blend[buf].EquationA); } } else { /* set same blend modes for all buffers */ - _mesa_BlendFuncSeparateEXT(color->Blend[0].SrcRGB, + _mesa_BlendFuncSeparate(color->Blend[0].SrcRGB, color->Blend[0].DstRGB, color->Blend[0].SrcA, color->Blend[0].DstA); @@ -957,7 +957,7 @@ _mesa_PopAttrib(void) _mesa_BlendEquation(color->Blend[0].EquationRGB); } else { - _mesa_BlendEquationSeparateEXT( + _mesa_BlendEquationSeparate( color->Blend[0].EquationRGB, color->Blend[0].EquationA); } @@ -972,8 +972,8 @@ _mesa_PopAttrib(void) _mesa_set_enable(ctx, GL_INDEX_LOGIC_OP, color->IndexLogicOpEnabled); _mesa_set_enable(ctx, GL_DITHER, color->DitherFlag); - _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR_ARB, color->ClampFragmentColor); - _mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor); + _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR_ARB, color->ClampFragmentColor); + _mesa_ClampColor(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor); /* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */ if (ctx->Extensions.EXT_framebuffer_sRGB) @@ -1100,7 +1100,7 @@ _mesa_PopAttrib(void) /* materials */ memcpy(&ctx->Light.Material, &light->Material, sizeof(struct gl_material)); - _mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, light->ClampVertexColor); + _mesa_ClampColor(GL_CLAMP_VERTEX_COLOR_ARB, light->ClampVertexColor); } break; case GL_LINE_BIT: @@ -1293,7 +1293,7 @@ _mesa_PopAttrib(void) ms->SampleAlphaToOne, GL_SAMPLE_ALPHA_TO_ONE); - _mesa_SampleCoverageARB(ms->SampleCoverageValue, + _mesa_SampleCoverage(ms->SampleCoverageValue, ms->SampleCoverageInvert); } break; @@ -1432,7 +1432,7 @@ restore_array_attrib(struct gl_context *ctx, const bool arb_vao = (src->ArrayObj->Name != 0 && src->ArrayObj->ARBsemantics); - if (arb_vao && !_mesa_IsVertexArrayAPPLE(src->ArrayObj->Name)) + if (arb_vao && !_mesa_IsVertexArray(src->ArrayObj->Name)) return; _mesa_BindVertexArrayAPPLE(src->ArrayObj->Name); @@ -1440,11 +1440,11 @@ restore_array_attrib(struct gl_context *ctx, /* Restore or recreate the buffer objects by the names ... */ if (!arb_vao || src->ArrayBufferObj->Name == 0 - || _mesa_IsBufferARB(src->ArrayBufferObj->Name)) { + || _mesa_IsBuffer(src->ArrayBufferObj->Name)) { /* ... and restore its content */ copy_array_attrib(ctx, dest, src, false); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, src->ArrayBufferObj->Name); } else { copy_array_attrib(ctx, dest, src, true); @@ -1452,8 +1452,8 @@ restore_array_attrib(struct gl_context *ctx, if (!arb_vao || src->ArrayObj->ElementArrayBufferObj->Name == 0 - || _mesa_IsBufferARB(src->ArrayObj->ElementArrayBufferObj->Name)) - _mesa_BindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, + || _mesa_IsBuffer(src->ArrayObj->ElementArrayBufferObj->Name)) + _mesa_BindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB, src->ArrayObj->ElementArrayBufferObj->Name); } diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index 5cd3ce24425..1930b1c37ce 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -170,7 +170,7 @@ validate_blend_factors(struct gl_context *ctx, const char *func, void GLAPIENTRY _mesa_BlendFunc( GLenum sfactor, GLenum dfactor ) { - _mesa_BlendFuncSeparateEXT(sfactor, dfactor, sfactor, dfactor); + _mesa_BlendFuncSeparate(sfactor, dfactor, sfactor, dfactor); } static GLboolean @@ -201,7 +201,7 @@ update_uses_dual_src(struct gl_context *ctx, int buf) * \param dfactorA alpha destination factor operator. */ void GLAPIENTRY -_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB, +_mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA ) { GLuint buf, numBuffers; @@ -260,9 +260,9 @@ _mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB, * Set blend source/dest factors for one color buffer/target. */ void GLAPIENTRY -_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) +_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor) { - _mesa_BlendFuncSeparatei(buf, sfactor, dfactor, sfactor, dfactor); + _mesa_BlendFuncSeparateiARB(buf, sfactor, dfactor, sfactor, dfactor); } @@ -270,7 +270,7 @@ _mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) * Set separate blend source/dest factors for one color buffer/target. */ void GLAPIENTRY -_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, +_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA) { GET_CURRENT_CONTEXT(ctx); @@ -384,7 +384,7 @@ _mesa_BlendEquation( GLenum mode ) * Set blend equation for one color buffer/target. */ void GLAPIENTRY -_mesa_BlendEquationi(GLuint buf, GLenum mode) +_mesa_BlendEquationiARB(GLuint buf, GLenum mode) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -419,7 +419,7 @@ _mesa_BlendEquationi(GLuint buf, GLenum mode) void GLAPIENTRY -_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA ) +_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA ) { GLuint buf, numBuffers; GLboolean changed; @@ -477,7 +477,7 @@ _mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA ) * Set separate blend equations for one color buffer/target. */ void GLAPIENTRY -_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA) +_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -730,7 +730,7 @@ _mesa_ColorMask( GLboolean red, GLboolean green, * For GL_EXT_draw_buffers2 and GL3 */ void GLAPIENTRY -_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green, +_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ) { GLubyte tmp[4]; @@ -766,7 +766,7 @@ _mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green, void GLAPIENTRY -_mesa_ClampColorARB(GLenum target, GLenum clamp) +_mesa_ClampColor(GLenum target, GLenum clamp) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h index d74f17ef160..a539aa80937 100644 --- a/src/mesa/main/blend.h +++ b/src/mesa/main/blend.h @@ -43,16 +43,16 @@ _mesa_BlendFunc( GLenum sfactor, GLenum dfactor ); extern void GLAPIENTRY -_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB, +_mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA ); extern void GLAPIENTRY -_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor); +_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor); extern void GLAPIENTRY -_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, +_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA); @@ -61,15 +61,15 @@ _mesa_BlendEquation( GLenum mode ); extern void GLAPIENTRY -_mesa_BlendEquationi(GLuint buf, GLenum mode); +_mesa_BlendEquationiARB(GLuint buf, GLenum mode); extern void GLAPIENTRY -_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA ); +_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA ); extern void GLAPIENTRY -_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA); +_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA); extern void GLAPIENTRY @@ -92,12 +92,12 @@ _mesa_ColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ); extern void GLAPIENTRY -_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green, +_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ); extern void GLAPIENTRY -_mesa_ClampColorARB(GLenum target, GLenum clamp); +_mesa_ClampColor(GLenum target, GLenum clamp); extern void diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index 43eb8876ea6..5521617f1af 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -819,7 +819,7 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver) /**********************************************************************/ void GLAPIENTRY -_mesa_BindBufferARB(GLenum target, GLuint buffer) +_mesa_BindBuffer(GLenum target, GLuint buffer) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -839,7 +839,7 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer) * \param ids Array of \c n buffer object IDs. */ void GLAPIENTRY -_mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids) +_mesa_DeleteBuffers(GLsizei n, const GLuint *ids) { GET_CURRENT_CONTEXT(ctx); GLsizei i; @@ -874,23 +874,23 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids) } if (ctx->Array.ArrayBufferObj == bufObj) { - _mesa_BindBufferARB( GL_ARRAY_BUFFER_ARB, 0 ); + _mesa_BindBuffer( GL_ARRAY_BUFFER_ARB, 0 ); } if (arrayObj->ElementArrayBufferObj == bufObj) { - _mesa_BindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 ); + _mesa_BindBuffer( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 ); } /* unbind ARB_copy_buffer binding points */ if (ctx->CopyReadBuffer == bufObj) { - _mesa_BindBufferARB( GL_COPY_READ_BUFFER, 0 ); + _mesa_BindBuffer( GL_COPY_READ_BUFFER, 0 ); } if (ctx->CopyWriteBuffer == bufObj) { - _mesa_BindBufferARB( GL_COPY_WRITE_BUFFER, 0 ); + _mesa_BindBuffer( GL_COPY_WRITE_BUFFER, 0 ); } /* unbind transform feedback binding points */ if (ctx->TransformFeedback.CurrentBuffer == bufObj) { - _mesa_BindBufferARB( GL_TRANSFORM_FEEDBACK_BUFFER, 0 ); + _mesa_BindBuffer( GL_TRANSFORM_FEEDBACK_BUFFER, 0 ); } for (j = 0; j < MAX_FEEDBACK_BUFFERS; j++) { if (ctx->TransformFeedback.CurrentObject->Buffers[j] == bufObj) { @@ -906,19 +906,19 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids) } if (ctx->UniformBuffer == bufObj) { - _mesa_BindBufferARB( GL_UNIFORM_BUFFER, 0 ); + _mesa_BindBuffer( GL_UNIFORM_BUFFER, 0 ); } /* unbind any pixel pack/unpack pointers bound to this buffer */ if (ctx->Pack.BufferObj == bufObj) { - _mesa_BindBufferARB( GL_PIXEL_PACK_BUFFER_EXT, 0 ); + _mesa_BindBuffer( GL_PIXEL_PACK_BUFFER_EXT, 0 ); } if (ctx->Unpack.BufferObj == bufObj) { - _mesa_BindBufferARB( GL_PIXEL_UNPACK_BUFFER_EXT, 0 ); + _mesa_BindBuffer( GL_PIXEL_UNPACK_BUFFER_EXT, 0 ); } if (ctx->Texture.BufferObject == bufObj) { - _mesa_BindBufferARB( GL_TEXTURE_BUFFER, 0 ); + _mesa_BindBuffer( GL_TEXTURE_BUFFER, 0 ); } /* The ID is immediately freed for re-use */ @@ -949,7 +949,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids) * \param buffer Array of \c n locations to store the IDs. */ void GLAPIENTRY -_mesa_GenBuffersARB(GLsizei n, GLuint *buffer) +_mesa_GenBuffers(GLsizei n, GLuint *buffer) { GET_CURRENT_CONTEXT(ctx); GLuint first; @@ -994,7 +994,7 @@ _mesa_GenBuffersARB(GLsizei n, GLuint *buffer) * \c GL_FALSE otherwise. */ GLboolean GLAPIENTRY -_mesa_IsBufferARB(GLuint id) +_mesa_IsBuffer(GLuint id) { struct gl_buffer_object *bufObj; GET_CURRENT_CONTEXT(ctx); @@ -1009,7 +1009,7 @@ _mesa_IsBufferARB(GLuint id) void GLAPIENTRY -_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, +_mesa_BufferData(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage) { GET_CURRENT_CONTEXT(ctx); @@ -1089,7 +1089,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, void GLAPIENTRY -_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, +_mesa_BufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data) { GET_CURRENT_CONTEXT(ctx); @@ -1114,7 +1114,7 @@ _mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, void GLAPIENTRY -_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, +_mesa_GetBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data) { GET_CURRENT_CONTEXT(ctx); @@ -1134,7 +1134,7 @@ _mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, void * GLAPIENTRY -_mesa_MapBufferARB(GLenum target, GLenum access) +_mesa_MapBuffer(GLenum target, GLenum access) { GET_CURRENT_CONTEXT(ctx); struct gl_buffer_object * bufObj; @@ -1229,7 +1229,7 @@ _mesa_MapBufferARB(GLenum target, GLenum access) GLboolean GLAPIENTRY -_mesa_UnmapBufferARB(GLenum target) +_mesa_UnmapBuffer(GLenum target) { GET_CURRENT_CONTEXT(ctx); struct gl_buffer_object *bufObj; @@ -1292,7 +1292,7 @@ _mesa_UnmapBufferARB(GLenum target) void GLAPIENTRY -_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params) +_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); struct gl_buffer_object *bufObj; @@ -1395,7 +1395,7 @@ invalid_pname: void GLAPIENTRY -_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params) +_mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params) { GET_CURRENT_CONTEXT(ctx); struct gl_buffer_object * bufObj; diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h index 4d5446ac082..e98e47670c6 100644 --- a/src/mesa/main/bufferobj.h +++ b/src/mesa/main/bufferobj.h @@ -101,29 +101,29 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver); */ void GLAPIENTRY -_mesa_BindBufferARB(GLenum target, GLuint buffer); +_mesa_BindBuffer(GLenum target, GLuint buffer); void GLAPIENTRY -_mesa_DeleteBuffersARB(GLsizei n, const GLuint * buffer); +_mesa_DeleteBuffers(GLsizei n, const GLuint * buffer); void GLAPIENTRY -_mesa_GenBuffersARB(GLsizei n, GLuint * buffer); +_mesa_GenBuffers(GLsizei n, GLuint * buffer); GLboolean GLAPIENTRY -_mesa_IsBufferARB(GLuint buffer); +_mesa_IsBuffer(GLuint buffer); void GLAPIENTRY -_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); +_mesa_BufferData(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); void GLAPIENTRY -_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); +_mesa_BufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); void GLAPIENTRY -_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data); +_mesa_GetBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data); void * GLAPIENTRY -_mesa_MapBufferARB(GLenum target, GLenum access); +_mesa_MapBuffer(GLenum target, GLenum access); GLboolean GLAPIENTRY -_mesa_UnmapBufferARB(GLenum target); +_mesa_UnmapBuffer(GLenum target); void GLAPIENTRY -_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params); +_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params); void GLAPIENTRY _mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params); void GLAPIENTRY -_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params); +_mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params); void GLAPIENTRY _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c index cc268b67cbc..fd430aad0cc 100644 --- a/src/mesa/main/buffers.c +++ b/src/mesa/main/buffers.c @@ -206,7 +206,7 @@ read_buffer_enum_to_index(GLenum buffer) * Called by glDrawBuffer(). * Specify which renderbuffer(s) to draw into for the first color output. * <buffer> can name zero, one, two or four renderbuffers! - * \sa _mesa_DrawBuffersARB + * \sa _mesa_DrawBuffers * * \param buffer buffer token such as GL_LEFT or GL_FRONT_AND_BACK, etc. * @@ -280,7 +280,7 @@ _mesa_DrawBuffer(GLenum buffer) * GL_FRONT_AND_BACK is illegal. */ void GLAPIENTRY -_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers) +_mesa_DrawBuffers(GLsizei n, const GLenum *buffers) { GLint output; GLbitfield usedBufferMask, supportedMask; diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h index 8083bc3d353..e9768f9446d 100644 --- a/src/mesa/main/buffers.h +++ b/src/mesa/main/buffers.h @@ -41,7 +41,7 @@ extern void GLAPIENTRY _mesa_DrawBuffer( GLenum mode ); extern void GLAPIENTRY -_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers); +_mesa_DrawBuffers(GLsizei n, const GLenum *buffers); extern void _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers, diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 8bbead7c4a2..6b99f35bb5f 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -1152,7 +1152,7 @@ save_BlendEquationSeparateEXT(GLenum modeRGB, GLenum modeA) n[2].e = modeA; } if (ctx->ExecuteFlag) { - CALL_BlendEquationSeparateEXT(ctx->Exec, (modeRGB, modeA)); + CALL_BlendEquationSeparate(ctx->Exec, (modeRGB, modeA)); } } @@ -1172,7 +1172,7 @@ save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB, n[4].e = dfactorA; } if (ctx->ExecuteFlag) { - CALL_BlendFuncSeparateEXT(ctx->Exec, + CALL_BlendFuncSeparate(ctx->Exec, (sfactorRGB, dfactorRGB, sfactorA, dfactorA)); } } @@ -1703,7 +1703,7 @@ save_ColorMaskIndexed(GLuint buf, GLboolean red, GLboolean green, n[5].b = alpha; } if (ctx->ExecuteFlag) { - /*CALL_ColorMaskIndexedEXT(ctx->Exec, (buf, red, green, blue, alpha));*/ + /*CALL_ColorMaski(ctx->Exec, (buf, red, green, blue, alpha));*/ } } @@ -2276,7 +2276,7 @@ save_DisableIndexed(GLuint index, GLenum cap) n[2].e = cap; } if (ctx->ExecuteFlag) { - CALL_DisableIndexedEXT(ctx->Exec, (index, cap)); + CALL_Disablei(ctx->Exec, (index, cap)); } } @@ -2351,7 +2351,7 @@ save_EnableIndexed(GLuint index, GLenum cap) n[2].e = cap; } if (ctx->ExecuteFlag) { - CALL_EnableIndexedEXT(ctx->Exec, (index, cap)); + CALL_Enablei(ctx->Exec, (index, cap)); } } @@ -3254,7 +3254,7 @@ save_PointParameterfvEXT(GLenum pname, const GLfloat *params) n[4].f = params[2]; } if (ctx->ExecuteFlag) { - CALL_PointParameterfvEXT(ctx->Exec, (pname, params)); + CALL_PointParameterfv(ctx->Exec, (pname, params)); } } @@ -4538,7 +4538,7 @@ save_ActiveTextureARB(GLenum target) n[1].e = target; } if (ctx->ExecuteFlag) { - CALL_ActiveTextureARB(ctx->Exec, (target)); + CALL_ActiveTexture(ctx->Exec, (target)); } } @@ -4609,7 +4609,7 @@ save_CompressedTexImage1DARB(GLenum target, GLint level, GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_1D) { /* don't compile, execute immediately */ - CALL_CompressedTexImage1DARB(ctx->Exec, (target, level, internalFormat, + CALL_CompressedTexImage1D(ctx->Exec, (target, level, internalFormat, width, border, imageSize, data)); } @@ -4628,7 +4628,7 @@ save_CompressedTexImage1DARB(GLenum target, GLint level, n[7].data = copy_data(data, imageSize, "glCompressedTexImage1DARB"); } if (ctx->ExecuteFlag) { - CALL_CompressedTexImage1DARB(ctx->Exec, + CALL_CompressedTexImage1D(ctx->Exec, (target, level, internalFormat, width, border, imageSize, data)); } @@ -4645,7 +4645,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level, GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_2D) { /* don't compile, execute immediately */ - CALL_CompressedTexImage2DARB(ctx->Exec, (target, level, internalFormat, + CALL_CompressedTexImage2D(ctx->Exec, (target, level, internalFormat, width, height, border, imageSize, data)); } @@ -4665,7 +4665,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level, n[8].data = copy_data(data, imageSize, "glCompressedTexImage2DARB"); } if (ctx->ExecuteFlag) { - CALL_CompressedTexImage2DARB(ctx->Exec, + CALL_CompressedTexImage2D(ctx->Exec, (target, level, internalFormat, width, height, border, imageSize, data)); } @@ -4682,7 +4682,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level, GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_3D) { /* don't compile, execute immediately */ - CALL_CompressedTexImage3DARB(ctx->Exec, (target, level, internalFormat, + CALL_CompressedTexImage3D(ctx->Exec, (target, level, internalFormat, width, height, depth, border, imageSize, data)); } @@ -4703,7 +4703,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level, n[9].data = copy_data(data, imageSize, "glCompressedTexImage3DARB"); } if (ctx->ExecuteFlag) { - CALL_CompressedTexImage3DARB(ctx->Exec, + CALL_CompressedTexImage3D(ctx->Exec, (target, level, internalFormat, width, height, depth, border, imageSize, data)); @@ -4732,7 +4732,7 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset, n[7].data = copy_data(data, imageSize, "glCompressedTexSubImage1DARB"); } if (ctx->ExecuteFlag) { - CALL_CompressedTexSubImage1DARB(ctx->Exec, (target, level, xoffset, + CALL_CompressedTexSubImage1D(ctx->Exec, (target, level, xoffset, width, format, imageSize, data)); } @@ -4762,7 +4762,7 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset, n[9].data = copy_data(data, imageSize, "glCompressedTexSubImage2DARB"); } if (ctx->ExecuteFlag) { - CALL_CompressedTexSubImage2DARB(ctx->Exec, + CALL_CompressedTexSubImage2D(ctx->Exec, (target, level, xoffset, yoffset, width, height, format, imageSize, data)); } @@ -4794,7 +4794,7 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset, n[11].data = copy_data(data, imageSize, "glCompressedTexSubImage3DARB"); } if (ctx->ExecuteFlag) { - CALL_CompressedTexSubImage3DARB(ctx->Exec, + CALL_CompressedTexSubImage3D(ctx->Exec, (target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data)); @@ -4815,7 +4815,7 @@ save_SampleCoverageARB(GLclampf value, GLboolean invert) n[2].b = invert; } if (ctx->ExecuteFlag) { - CALL_SampleCoverageARB(ctx->Exec, (value, invert)); + CALL_SampleCoverage(ctx->Exec, (value, invert)); } } @@ -4835,7 +4835,7 @@ save_BindProgramNV(GLenum target, GLuint id) n[2].ui = id; } if (ctx->ExecuteFlag) { - CALL_BindProgramNV(ctx->Exec, (target, id)); + CALL_BindProgramARB(ctx->Exec, (target, id)); } } @@ -5120,7 +5120,7 @@ save_BeginQueryARB(GLenum target, GLuint id) n[2].ui = id; } if (ctx->ExecuteFlag) { - CALL_BeginQueryARB(ctx->Exec, (target, id)); + CALL_BeginQuery(ctx->Exec, (target, id)); } } @@ -5135,7 +5135,7 @@ save_EndQueryARB(GLenum target) n[1].e = target; } if (ctx->ExecuteFlag) { - CALL_EndQueryARB(ctx->Exec, (target)); + CALL_EndQuery(ctx->Exec, (target)); } } @@ -5206,7 +5206,7 @@ save_DrawBuffersARB(GLsizei count, const GLenum * buffers) } } if (ctx->ExecuteFlag) { - CALL_DrawBuffersARB(ctx->Exec, (count, buffers)); + CALL_DrawBuffers(ctx->Exec, (count, buffers)); } } @@ -6022,7 +6022,7 @@ exec_BindAttribLocationARB(GLuint program, GLuint index, const GLchar *name) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_BindAttribLocationARB(ctx->Exec, (program, index, name)); + CALL_BindAttribLocation(ctx->Exec, (program, index, name)); } static GLint GLAPIENTRY @@ -6030,7 +6030,7 @@ exec_GetAttribLocationARB(GLuint program, const GLchar *name) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - return CALL_GetAttribLocationARB(ctx->Exec, (program, name)); + return CALL_GetAttribLocation(ctx->Exec, (program, name)); } static GLint GLAPIENTRY @@ -6038,7 +6038,7 @@ exec_GetUniformLocationARB(GLuint program, const GLchar *name) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - return CALL_GetUniformLocationARB(ctx->Exec, (program, name)); + return CALL_GetUniformLocation(ctx->Exec, (program, name)); } /* XXX more shader functions needed here */ @@ -6065,7 +6065,7 @@ save_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, n[10].e = filter; } if (ctx->ExecuteFlag) { - CALL_BlitFramebufferEXT(ctx->Exec, (srcX0, srcY0, srcX1, srcY1, + CALL_BlitFramebuffer(ctx->Exec, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter)); } @@ -6084,8 +6084,8 @@ save_ProvokingVertexEXT(GLenum mode) n[1].e = mode; } if (ctx->ExecuteFlag) { - /*CALL_ProvokingVertexEXT(ctx->Exec, (mode));*/ - _mesa_ProvokingVertexEXT(mode); + /*CALL_ProvokingVertex(ctx->Exec, (mode));*/ + _mesa_ProvokingVertex(mode); } } @@ -6102,7 +6102,7 @@ save_BeginTransformFeedback(GLenum mode) n[1].e = mode; } if (ctx->ExecuteFlag) { - CALL_BeginTransformFeedbackEXT(ctx->Exec, (mode)); + CALL_BeginTransformFeedback(ctx->Exec, (mode)); } } @@ -6115,7 +6115,7 @@ save_EndTransformFeedback(void) ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); (void) alloc_instruction(ctx, OPCODE_END_TRANSFORM_FEEDBACK, 0); if (ctx->ExecuteFlag) { - CALL_EndTransformFeedbackEXT(ctx->Exec, ()); + CALL_EndTransformFeedback(ctx->Exec, ()); } } @@ -6240,7 +6240,7 @@ save_UseProgramObjectARB(GLhandleARB program) n[1].ui = program; } if (ctx->ExecuteFlag) { - CALL_UseProgramObjectARB(ctx->Exec, (program)); + CALL_UseProgram(ctx->Exec, (program)); } } @@ -6257,7 +6257,7 @@ save_Uniform1fARB(GLint location, GLfloat x) n[2].f = x; } if (ctx->ExecuteFlag) { - CALL_Uniform1fARB(ctx->Exec, (location, x)); + CALL_Uniform1f(ctx->Exec, (location, x)); } } @@ -6275,7 +6275,7 @@ save_Uniform2fARB(GLint location, GLfloat x, GLfloat y) n[3].f = y; } if (ctx->ExecuteFlag) { - CALL_Uniform2fARB(ctx->Exec, (location, x, y)); + CALL_Uniform2f(ctx->Exec, (location, x, y)); } } @@ -6294,7 +6294,7 @@ save_Uniform3fARB(GLint location, GLfloat x, GLfloat y, GLfloat z) n[4].f = z; } if (ctx->ExecuteFlag) { - CALL_Uniform3fARB(ctx->Exec, (location, x, y, z)); + CALL_Uniform3f(ctx->Exec, (location, x, y, z)); } } @@ -6314,7 +6314,7 @@ save_Uniform4fARB(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w) n[5].f = w; } if (ctx->ExecuteFlag) { - CALL_Uniform4fARB(ctx->Exec, (location, x, y, z, w)); + CALL_Uniform4f(ctx->Exec, (location, x, y, z, w)); } } @@ -6343,7 +6343,7 @@ save_Uniform1fvARB(GLint location, GLsizei count, const GLfloat *v) n[3].data = memdup(v, count * 1 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_Uniform1fvARB(ctx->Exec, (location, count, v)); + CALL_Uniform1fv(ctx->Exec, (location, count, v)); } } @@ -6360,7 +6360,7 @@ save_Uniform2fvARB(GLint location, GLsizei count, const GLfloat *v) n[3].data = memdup(v, count * 2 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_Uniform2fvARB(ctx->Exec, (location, count, v)); + CALL_Uniform2fv(ctx->Exec, (location, count, v)); } } @@ -6377,7 +6377,7 @@ save_Uniform3fvARB(GLint location, GLsizei count, const GLfloat *v) n[3].data = memdup(v, count * 3 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_Uniform3fvARB(ctx->Exec, (location, count, v)); + CALL_Uniform3fv(ctx->Exec, (location, count, v)); } } @@ -6394,7 +6394,7 @@ save_Uniform4fvARB(GLint location, GLsizei count, const GLfloat *v) n[3].data = memdup(v, count * 4 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_Uniform4fvARB(ctx->Exec, (location, count, v)); + CALL_Uniform4fv(ctx->Exec, (location, count, v)); } } @@ -6411,7 +6411,7 @@ save_Uniform1iARB(GLint location, GLint x) n[2].i = x; } if (ctx->ExecuteFlag) { - CALL_Uniform1iARB(ctx->Exec, (location, x)); + CALL_Uniform1i(ctx->Exec, (location, x)); } } @@ -6428,7 +6428,7 @@ save_Uniform2iARB(GLint location, GLint x, GLint y) n[3].i = y; } if (ctx->ExecuteFlag) { - CALL_Uniform2iARB(ctx->Exec, (location, x, y)); + CALL_Uniform2i(ctx->Exec, (location, x, y)); } } @@ -6446,7 +6446,7 @@ save_Uniform3iARB(GLint location, GLint x, GLint y, GLint z) n[4].i = z; } if (ctx->ExecuteFlag) { - CALL_Uniform3iARB(ctx->Exec, (location, x, y, z)); + CALL_Uniform3i(ctx->Exec, (location, x, y, z)); } } @@ -6465,7 +6465,7 @@ save_Uniform4iARB(GLint location, GLint x, GLint y, GLint z, GLint w) n[5].i = w; } if (ctx->ExecuteFlag) { - CALL_Uniform4iARB(ctx->Exec, (location, x, y, z, w)); + CALL_Uniform4i(ctx->Exec, (location, x, y, z, w)); } } @@ -6484,7 +6484,7 @@ save_Uniform1ivARB(GLint location, GLsizei count, const GLint *v) n[3].data = memdup(v, count * 1 * sizeof(GLint)); } if (ctx->ExecuteFlag) { - CALL_Uniform1ivARB(ctx->Exec, (location, count, v)); + CALL_Uniform1iv(ctx->Exec, (location, count, v)); } } @@ -6501,7 +6501,7 @@ save_Uniform2ivARB(GLint location, GLsizei count, const GLint *v) n[3].data = memdup(v, count * 2 * sizeof(GLint)); } if (ctx->ExecuteFlag) { - CALL_Uniform2ivARB(ctx->Exec, (location, count, v)); + CALL_Uniform2iv(ctx->Exec, (location, count, v)); } } @@ -6518,7 +6518,7 @@ save_Uniform3ivARB(GLint location, GLsizei count, const GLint *v) n[3].data = memdup(v, count * 3 * sizeof(GLint)); } if (ctx->ExecuteFlag) { - CALL_Uniform3ivARB(ctx->Exec, (location, count, v)); + CALL_Uniform3iv(ctx->Exec, (location, count, v)); } } @@ -6535,7 +6535,7 @@ save_Uniform4ivARB(GLint location, GLsizei count, const GLint *v) n[3].data = memdup(v, count * 4 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_Uniform4ivARB(ctx->Exec, (location, count, v)); + CALL_Uniform4iv(ctx->Exec, (location, count, v)); } } @@ -6698,7 +6698,7 @@ save_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose, n[4].data = memdup(m, count * 2 * 2 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_UniformMatrix2fvARB(ctx->Exec, (location, count, transpose, m)); + CALL_UniformMatrix2fv(ctx->Exec, (location, count, transpose, m)); } } @@ -6717,7 +6717,7 @@ save_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose, n[4].data = memdup(m, count * 3 * 3 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_UniformMatrix3fvARB(ctx->Exec, (location, count, transpose, m)); + CALL_UniformMatrix3fv(ctx->Exec, (location, count, transpose, m)); } } @@ -6736,7 +6736,7 @@ save_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose, n[4].data = memdup(m, count * 4 * 4 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_UniformMatrix4fvARB(ctx->Exec, (location, count, transpose, m)); + CALL_UniformMatrix4fv(ctx->Exec, (location, count, transpose, m)); } } @@ -6869,7 +6869,7 @@ save_ClampColorARB(GLenum target, GLenum clamp) n[2].e = clamp; } if (ctx->ExecuteFlag) { - CALL_ClampColorARB(ctx->Exec, (target, clamp)); + CALL_ClampColor(ctx->Exec, (target, clamp)); } } @@ -6959,7 +6959,7 @@ save_TexParameterIiv(GLenum target, GLenum pname, const GLint *params) n[6].i = params[3]; } if (ctx->ExecuteFlag) { - CALL_TexParameterIivEXT(ctx->Exec, (target, pname, params)); + CALL_TexParameterIiv(ctx->Exec, (target, pname, params)); } } @@ -6980,7 +6980,7 @@ save_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params) n[6].ui = params[3]; } if (ctx->ExecuteFlag) { - CALL_TexParameterIuivEXT(ctx->Exec, (target, pname, params)); + CALL_TexParameterIuiv(ctx->Exec, (target, pname, params)); } } @@ -6990,7 +6990,7 @@ exec_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexParameterIivEXT(ctx->Exec, (target, pname, params)); + CALL_GetTexParameterIiv(ctx->Exec, (target, pname, params)); } /** GL_EXT_texture_integer */ @@ -6999,7 +6999,7 @@ exec_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexParameterIuivEXT(ctx->Exec, (target, pname, params)); + CALL_GetTexParameterIuiv(ctx->Exec, (target, pname, params)); } @@ -7016,7 +7016,7 @@ save_VertexAttribDivisor(GLuint index, GLuint divisor) n[2].ui = divisor; } if (ctx->ExecuteFlag) { - CALL_VertexAttribDivisorARB(ctx->Exec, (index, divisor)); + CALL_VertexAttribDivisor(ctx->Exec, (index, divisor)); } } @@ -7257,7 +7257,7 @@ save_BeginConditionalRender(GLuint queryId, GLenum mode) n[2].e = mode; } if (ctx->ExecuteFlag) { - CALL_BeginConditionalRenderNV(ctx->Exec, (queryId, mode)); + CALL_BeginConditionalRender(ctx->Exec, (queryId, mode)); } } @@ -7268,7 +7268,7 @@ save_EndConditionalRender(void) ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); alloc_instruction(ctx, OPCODE_END_CONDITIONAL_RENDER, 0); if (ctx->ExecuteFlag) { - CALL_EndConditionalRenderNV(ctx->Exec, ()); + CALL_EndConditionalRender(ctx->Exec, ()); } } @@ -7412,10 +7412,10 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_BlendEquation(ctx->Exec, (n[1].e)); break; case OPCODE_BLEND_EQUATION_SEPARATE: - CALL_BlendEquationSeparateEXT(ctx->Exec, (n[1].e, n[2].e)); + CALL_BlendEquationSeparate(ctx->Exec, (n[1].e, n[2].e)); break; case OPCODE_BLEND_FUNC_SEPARATE: - CALL_BlendFuncSeparateEXT(ctx->Exec, + CALL_BlendFuncSeparate(ctx->Exec, (n[1].e, n[2].e, n[3].e, n[4].e)); break; @@ -7520,7 +7520,7 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_ColorMask(ctx->Exec, (n[1].b, n[2].b, n[3].b, n[4].b)); break; case OPCODE_COLOR_MASK_INDEXED: - CALL_ColorMaskIndexedEXT(ctx->Exec, (n[1].ui, n[2].b, n[3].b, + CALL_ColorMaski(ctx->Exec, (n[1].ui, n[2].b, n[3].b, n[4].b, n[5].b)); break; case OPCODE_COLOR_MATERIAL: @@ -7666,7 +7666,7 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_Disable(ctx->Exec, (n[1].e)); break; case OPCODE_DISABLE_INDEXED: - CALL_DisableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e)); + CALL_Disablei(ctx->Exec, (n[1].ui, n[2].e)); break; case OPCODE_DRAW_BUFFER: CALL_DrawBuffer(ctx->Exec, (n[1].e)); @@ -7684,7 +7684,7 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_Enable(ctx->Exec, (n[1].e)); break; case OPCODE_ENABLE_INDEXED: - CALL_EnableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e)); + CALL_Enablei(ctx->Exec, (n[1].ui, n[2].e)); break; case OPCODE_EVALMESH1: CALL_EvalMesh1(ctx->Exec, (n[1].e, n[2].i, n[3].i)); @@ -7852,7 +7852,7 @@ execute_list(struct gl_context *ctx, GLuint list) params[0] = n[2].f; params[1] = n[3].f; params[2] = n[4].f; - CALL_PointParameterfvEXT(ctx->Exec, (n[1].e, params)); + CALL_PointParameterfv(ctx->Exec, (n[1].e, params)); } break; case OPCODE_POLYGON_MODE: @@ -7915,7 +7915,7 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_ShadeModel(ctx->Exec, (n[1].e)); break; case OPCODE_PROVOKING_VERTEX: - CALL_ProvokingVertexEXT(ctx->Exec, (n[1].e)); + CALL_ProvokingVertex(ctx->Exec, (n[1].e)); break; case OPCODE_STENCIL_FUNC: CALL_StencilFunc(ctx->Exec, (n[1].e, n[2].i, n[3].ui)); @@ -8058,49 +8058,49 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_WindowPos4fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f)); break; case OPCODE_ACTIVE_TEXTURE: /* GL_ARB_multitexture */ - CALL_ActiveTextureARB(ctx->Exec, (n[1].e)); + CALL_ActiveTexture(ctx->Exec, (n[1].e)); break; case OPCODE_COMPRESSED_TEX_IMAGE_1D: /* GL_ARB_texture_compression */ - CALL_CompressedTexImage1DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e, + CALL_CompressedTexImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].i, n[5].i, n[6].i, n[7].data)); break; case OPCODE_COMPRESSED_TEX_IMAGE_2D: /* GL_ARB_texture_compression */ - CALL_CompressedTexImage2DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e, + CALL_CompressedTexImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].i, n[5].i, n[6].i, n[7].i, n[8].data)); break; case OPCODE_COMPRESSED_TEX_IMAGE_3D: /* GL_ARB_texture_compression */ - CALL_CompressedTexImage3DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e, + CALL_CompressedTexImage3D(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].i, n[5].i, n[6].i, n[7].i, n[8].i, n[9].data)); break; case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D: /* GL_ARB_texture_compress */ - CALL_CompressedTexSubImage1DARB(ctx->Exec, + CALL_CompressedTexSubImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].i, n[4].i, n[5].e, n[6].i, n[7].data)); break; case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D: /* GL_ARB_texture_compress */ - CALL_CompressedTexSubImage2DARB(ctx->Exec, + CALL_CompressedTexSubImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].i, n[4].i, n[5].i, n[6].i, n[7].e, n[8].i, n[9].data)); break; case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D: /* GL_ARB_texture_compress */ - CALL_CompressedTexSubImage3DARB(ctx->Exec, + CALL_CompressedTexSubImage3D(ctx->Exec, (n[1].e, n[2].i, n[3].i, n[4].i, n[5].i, n[6].i, n[7].i, n[8].i, n[9].e, n[10].i, n[11].data)); break; case OPCODE_SAMPLE_COVERAGE: /* GL_ARB_multisample */ - CALL_SampleCoverageARB(ctx->Exec, (n[1].f, n[2].b)); + CALL_SampleCoverage(ctx->Exec, (n[1].f, n[2].b)); break; case OPCODE_WINDOW_POS_ARB: /* GL_ARB_window_pos */ - CALL_WindowPos3fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f)); + CALL_WindowPos3f(ctx->Exec, (n[1].f, n[2].f, n[3].f)); break; case OPCODE_BIND_PROGRAM_NV: /* GL_ARB_vertex_program */ - CALL_BindProgramNV(ctx->Exec, (n[1].e, n[2].ui)); + CALL_BindProgramARB(ctx->Exec, (n[1].e, n[2].ui)); break; case OPCODE_PROGRAM_LOCAL_PARAMETER_ARB: CALL_ProgramLocalParameter4fARB(ctx->Exec, @@ -8123,10 +8123,10 @@ execute_list(struct gl_context *ctx, GLuint list) n[6].f)); break; case OPCODE_BEGIN_QUERY_ARB: - CALL_BeginQueryARB(ctx->Exec, (n[1].e, n[2].ui)); + CALL_BeginQuery(ctx->Exec, (n[1].e, n[2].ui)); break; case OPCODE_END_QUERY_ARB: - CALL_EndQueryARB(ctx->Exec, (n[1].e)); + CALL_EndQuery(ctx->Exec, (n[1].e)); break; case OPCODE_QUERY_COUNTER: CALL_QueryCounter(ctx->Exec, (n[1].ui, n[2].e)); @@ -8143,16 +8143,16 @@ execute_list(struct gl_context *ctx, GLuint list) GLint i, count = MIN2(n[1].i, MAX_DRAW_BUFFERS); for (i = 0; i < count; i++) buffers[i] = n[2 + i].e; - CALL_DrawBuffersARB(ctx->Exec, (n[1].i, buffers)); + CALL_DrawBuffers(ctx->Exec, (n[1].i, buffers)); } break; case OPCODE_BLIT_FRAMEBUFFER: - CALL_BlitFramebufferEXT(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i, + CALL_BlitFramebuffer(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i, n[5].i, n[6].i, n[7].i, n[8].i, n[9].i, n[10].e)); break; case OPCODE_USE_PROGRAM: - CALL_UseProgramObjectARB(ctx->Exec, (n[1].ui)); + CALL_UseProgram(ctx->Exec, (n[1].ui)); break; case OPCODE_USE_SHADER_PROGRAM_EXT: CALL_UseShaderProgramEXT(ctx->Exec, (n[1].ui, n[2].ui)); @@ -8161,54 +8161,54 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_ActiveProgramEXT(ctx->Exec, (n[1].ui)); break; case OPCODE_UNIFORM_1F: - CALL_Uniform1fARB(ctx->Exec, (n[1].i, n[2].f)); + CALL_Uniform1f(ctx->Exec, (n[1].i, n[2].f)); break; case OPCODE_UNIFORM_2F: - CALL_Uniform2fARB(ctx->Exec, (n[1].i, n[2].f, n[3].f)); + CALL_Uniform2f(ctx->Exec, (n[1].i, n[2].f, n[3].f)); break; case OPCODE_UNIFORM_3F: - CALL_Uniform3fARB(ctx->Exec, (n[1].i, n[2].f, n[3].f, n[4].f)); + CALL_Uniform3f(ctx->Exec, (n[1].i, n[2].f, n[3].f, n[4].f)); break; case OPCODE_UNIFORM_4F: - CALL_Uniform4fARB(ctx->Exec, + CALL_Uniform4f(ctx->Exec, (n[1].i, n[2].f, n[3].f, n[4].f, n[5].f)); break; case OPCODE_UNIFORM_1FV: - CALL_Uniform1fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform1fv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_2FV: - CALL_Uniform2fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform2fv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_3FV: - CALL_Uniform3fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform3fv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_4FV: - CALL_Uniform4fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform4fv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_1I: - CALL_Uniform1iARB(ctx->Exec, (n[1].i, n[2].i)); + CALL_Uniform1i(ctx->Exec, (n[1].i, n[2].i)); break; case OPCODE_UNIFORM_2I: - CALL_Uniform2iARB(ctx->Exec, (n[1].i, n[2].i, n[3].i)); + CALL_Uniform2i(ctx->Exec, (n[1].i, n[2].i, n[3].i)); break; case OPCODE_UNIFORM_3I: - CALL_Uniform3iARB(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i)); + CALL_Uniform3i(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i)); break; case OPCODE_UNIFORM_4I: - CALL_Uniform4iARB(ctx->Exec, + CALL_Uniform4i(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i, n[5].i)); break; case OPCODE_UNIFORM_1IV: - CALL_Uniform1ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform1iv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_2IV: - CALL_Uniform2ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform2iv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_3IV: - CALL_Uniform3ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform3iv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_4IV: - CALL_Uniform4ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform4iv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_1UI: /*CALL_Uniform1uiARB(ctx->Exec, (n[1].i, n[2].i));*/ @@ -8237,15 +8237,15 @@ execute_list(struct gl_context *ctx, GLuint list) /*CALL_Uniform4uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/ break; case OPCODE_UNIFORM_MATRIX22: - CALL_UniformMatrix2fvARB(ctx->Exec, + CALL_UniformMatrix2fv(ctx->Exec, (n[1].i, n[2].i, n[3].b, n[4].data)); break; case OPCODE_UNIFORM_MATRIX33: - CALL_UniformMatrix3fvARB(ctx->Exec, + CALL_UniformMatrix3fv(ctx->Exec, (n[1].i, n[2].i, n[3].b, n[4].data)); break; case OPCODE_UNIFORM_MATRIX44: - CALL_UniformMatrix4fvARB(ctx->Exec, + CALL_UniformMatrix4fv(ctx->Exec, (n[1].i, n[2].i, n[3].b, n[4].data)); break; case OPCODE_UNIFORM_MATRIX23: @@ -8274,7 +8274,7 @@ execute_list(struct gl_context *ctx, GLuint list) break; case OPCODE_CLAMP_COLOR: - CALL_ClampColorARB(ctx->Exec, (n[1].e, n[2].e)); + CALL_ClampColor(ctx->Exec, (n[1].e, n[2].e)); break; case OPCODE_TEX_BUMP_PARAMETER_ATI: @@ -8407,7 +8407,7 @@ execute_list(struct gl_context *ctx, GLuint list) params[1] = n[4].i; params[2] = n[5].i; params[3] = n[6].i; - CALL_TexParameterIivEXT(ctx->Exec, (n[1].e, n[2].e, params)); + CALL_TexParameterIiv(ctx->Exec, (n[1].e, n[2].e, params)); } break; case OPCODE_TEXPARAMETER_UI: @@ -8417,13 +8417,13 @@ execute_list(struct gl_context *ctx, GLuint list) params[1] = n[4].ui; params[2] = n[5].ui; params[3] = n[6].ui; - CALL_TexParameterIuivEXT(ctx->Exec, (n[1].e, n[2].e, params)); + CALL_TexParameterIuiv(ctx->Exec, (n[1].e, n[2].e, params)); } break; case OPCODE_VERTEX_ATTRIB_DIVISOR: /* GL_ARB_instanced_arrays */ - CALL_VertexAttribDivisorARB(ctx->Exec, (n[1].ui, n[2].ui)); + CALL_VertexAttribDivisor(ctx->Exec, (n[1].ui, n[2].ui)); break; case OPCODE_TEXTURE_BARRIER_NV: @@ -8432,10 +8432,10 @@ execute_list(struct gl_context *ctx, GLuint list) /* GL_EXT/ARB_transform_feedback */ case OPCODE_BEGIN_TRANSFORM_FEEDBACK: - CALL_BeginTransformFeedbackEXT(ctx->Exec, (n[1].e)); + CALL_BeginTransformFeedback(ctx->Exec, (n[1].e)); break; case OPCODE_END_TRANSFORM_FEEDBACK: - CALL_EndTransformFeedbackEXT(ctx->Exec, ()); + CALL_EndTransformFeedback(ctx->Exec, ()); break; case OPCODE_BIND_TRANSFORM_FEEDBACK: CALL_BindTransformFeedback(ctx->Exec, (n[1].e, n[2].ui)); @@ -8532,10 +8532,10 @@ execute_list(struct gl_context *ctx, GLuint list) /* GL_NV_conditional_render */ case OPCODE_BEGIN_CONDITIONAL_RENDER: - CALL_BeginConditionalRenderNV(ctx->Exec, (n[1].i, n[2].e)); + CALL_BeginConditionalRender(ctx->Exec, (n[1].i, n[2].e)); break; case OPCODE_END_CONDITIONAL_RENDER: - CALL_EndConditionalRenderNV(ctx->Exec, ()); + CALL_EndConditionalRender(ctx->Exec, ()); break; case OPCODE_UNIFORM_BLOCK_BINDING: @@ -9280,7 +9280,7 @@ exec_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid * img) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetCompressedTexImageARB(ctx->Exec, (target, level, img)); + CALL_GetCompressedTexImage(ctx->Exec, (target, level, img)); } static void GLAPIENTRY @@ -9508,7 +9508,7 @@ exec_ClientActiveTextureARB(GLenum target) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_ClientActiveTextureARB(ctx->Exec, (target)); + CALL_ClientActiveTexture(ctx->Exec, (target)); } static void GLAPIENTRY @@ -9517,7 +9517,7 @@ exec_SecondaryColorPointerEXT(GLint size, GLenum type, { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_SecondaryColorPointerEXT(ctx->Exec, (size, type, stride, ptr)); + CALL_SecondaryColorPointer(ctx->Exec, (size, type, stride, ptr)); } static void GLAPIENTRY @@ -9525,7 +9525,7 @@ exec_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_FogCoordPointerEXT(ctx->Exec, (type, stride, ptr)); + CALL_FogCoordPointer(ctx->Exec, (type, stride, ptr)); } /* GL_EXT_multi_draw_arrays */ @@ -9535,7 +9535,7 @@ exec_MultiDrawArraysEXT(GLenum mode, const GLint *first, { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_MultiDrawArraysEXT(ctx->Exec, (mode, first, count, primcount)); + CALL_MultiDrawArrays(ctx->Exec, (mode, first, count, primcount)); } /* GL_IBM_multimode_draw_arrays */ @@ -9599,7 +9599,7 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_ClearStencil(table, save_ClearStencil); SET_ClipPlane(table, save_ClipPlane); SET_ColorMask(table, save_ColorMask); - SET_ColorMaskIndexedEXT(table, save_ColorMaskIndexed); + SET_ColorMaski(table, save_ColorMaskIndexed); SET_ColorMaterial(table, save_ColorMaterial); SET_CopyPixels(table, save_CopyPixels); SET_CullFace(table, save_CullFace); @@ -9608,11 +9608,11 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_DepthMask(table, save_DepthMask); SET_DepthRange(table, save_DepthRange); SET_Disable(table, save_Disable); - SET_DisableIndexedEXT(table, save_DisableIndexed); + SET_Disablei(table, save_DisableIndexed); SET_DrawBuffer(table, save_DrawBuffer); SET_DrawPixels(table, save_DrawPixels); SET_Enable(table, save_Enable); - SET_EnableIndexedEXT(table, save_EnableIndexed); + SET_Enablei(table, save_EnableIndexed); SET_EndList(table, _mesa_EndList); SET_EvalMesh1(table, save_EvalMesh1); SET_EvalMesh2(table, save_EvalMesh2); @@ -9878,45 +9878,45 @@ _mesa_create_save_table(const struct gl_context *ctx) #endif /* 54. GL_EXT_point_parameters */ - SET_PointParameterfEXT(table, save_PointParameterfEXT); - SET_PointParameterfvEXT(table, save_PointParameterfvEXT); + SET_PointParameterf(table, save_PointParameterfEXT); + SET_PointParameterfv(table, save_PointParameterfvEXT); /* 97. GL_EXT_compiled_vertex_array */ SET_LockArraysEXT(table, exec_LockArraysEXT); SET_UnlockArraysEXT(table, exec_UnlockArraysEXT); /* 145. GL_EXT_secondary_color */ - SET_SecondaryColorPointerEXT(table, exec_SecondaryColorPointerEXT); + SET_SecondaryColorPointer(table, exec_SecondaryColorPointerEXT); /* 148. GL_EXT_multi_draw_arrays */ - SET_MultiDrawArraysEXT(table, exec_MultiDrawArraysEXT); + SET_MultiDrawArrays(table, exec_MultiDrawArraysEXT); /* 149. GL_EXT_fog_coord */ - SET_FogCoordPointerEXT(table, exec_FogCoordPointerEXT); + SET_FogCoordPointer(table, exec_FogCoordPointerEXT); /* 173. GL_EXT_blend_func_separate */ - SET_BlendFuncSeparateEXT(table, save_BlendFuncSeparateEXT); + SET_BlendFuncSeparate(table, save_BlendFuncSeparateEXT); /* 196. GL_MESA_resize_buffers */ SET_ResizeBuffersMESA(table, _mesa_ResizeBuffersMESA); /* 197. GL_MESA_window_pos */ - SET_WindowPos2dMESA(table, save_WindowPos2dMESA); - SET_WindowPos2dvMESA(table, save_WindowPos2dvMESA); - SET_WindowPos2fMESA(table, save_WindowPos2fMESA); - SET_WindowPos2fvMESA(table, save_WindowPos2fvMESA); - SET_WindowPos2iMESA(table, save_WindowPos2iMESA); - SET_WindowPos2ivMESA(table, save_WindowPos2ivMESA); - SET_WindowPos2sMESA(table, save_WindowPos2sMESA); - SET_WindowPos2svMESA(table, save_WindowPos2svMESA); - SET_WindowPos3dMESA(table, save_WindowPos3dMESA); - SET_WindowPos3dvMESA(table, save_WindowPos3dvMESA); - SET_WindowPos3fMESA(table, save_WindowPos3fMESA); - SET_WindowPos3fvMESA(table, save_WindowPos3fvMESA); - SET_WindowPos3iMESA(table, save_WindowPos3iMESA); - SET_WindowPos3ivMESA(table, save_WindowPos3ivMESA); - SET_WindowPos3sMESA(table, save_WindowPos3sMESA); - SET_WindowPos3svMESA(table, save_WindowPos3svMESA); + SET_WindowPos2d(table, save_WindowPos2dMESA); + SET_WindowPos2dv(table, save_WindowPos2dvMESA); + SET_WindowPos2f(table, save_WindowPos2fMESA); + SET_WindowPos2fv(table, save_WindowPos2fvMESA); + SET_WindowPos2i(table, save_WindowPos2iMESA); + SET_WindowPos2iv(table, save_WindowPos2ivMESA); + SET_WindowPos2s(table, save_WindowPos2sMESA); + SET_WindowPos2sv(table, save_WindowPos2svMESA); + SET_WindowPos3d(table, save_WindowPos3dMESA); + SET_WindowPos3dv(table, save_WindowPos3dvMESA); + SET_WindowPos3f(table, save_WindowPos3fMESA); + SET_WindowPos3fv(table, save_WindowPos3fvMESA); + SET_WindowPos3i(table, save_WindowPos3iMESA); + SET_WindowPos3iv(table, save_WindowPos3ivMESA); + SET_WindowPos3s(table, save_WindowPos3sMESA); + SET_WindowPos3sv(table, save_WindowPos3svMESA); SET_WindowPos4dMESA(table, save_WindowPos4dMESA); SET_WindowPos4dvMESA(table, save_WindowPos4dvMESA); SET_WindowPos4fMESA(table, save_WindowPos4fMESA); @@ -9935,10 +9935,10 @@ _mesa_create_save_table(const struct gl_context *ctx) * AreProgramsResidentNV, IsProgramNV, GenProgramsNV, DeleteProgramsNV, * VertexAttribPointerNV, GetProgram*, GetVertexAttrib* */ - SET_BindProgramNV(table, save_BindProgramNV); - SET_DeleteProgramsNV(table, _mesa_DeletePrograms); - SET_GenProgramsNV(table, _mesa_GenPrograms); - SET_IsProgramNV(table, _mesa_IsProgramARB); + SET_BindProgramARB(table, save_BindProgramNV); + SET_DeleteProgramsARB(table, _mesa_DeleteProgramsARB); + SET_GenProgramsARB(table, _mesa_GenProgramsARB); + SET_IsProgramARB(table, _mesa_IsProgramARB); /* 244. GL_ATI_envmap_bumpmap */ SET_TexBumpParameterivATI(table, save_TexBumpParameterivATI); @@ -9949,32 +9949,32 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_SetFragmentShaderConstantATI(table, save_SetFragmentShaderConstantATI); /* 262. GL_NV_point_sprite */ - SET_PointParameteriNV(table, save_PointParameteriNV); - SET_PointParameterivNV(table, save_PointParameterivNV); + SET_PointParameteri(table, save_PointParameteriNV); + SET_PointParameteriv(table, save_PointParameterivNV); /* 268. GL_EXT_stencil_two_side */ SET_ActiveStencilFaceEXT(table, save_ActiveStencilFaceEXT); /* 273. GL_APPLE_vertex_array_object */ SET_BindVertexArrayAPPLE(table, _mesa_BindVertexArrayAPPLE); - SET_DeleteVertexArraysAPPLE(table, _mesa_DeleteVertexArraysAPPLE); + SET_DeleteVertexArrays(table, _mesa_DeleteVertexArrays); SET_GenVertexArraysAPPLE(table, _mesa_GenVertexArraysAPPLE); - SET_IsVertexArrayAPPLE(table, _mesa_IsVertexArrayAPPLE); + SET_IsVertexArray(table, _mesa_IsVertexArray); /* 310. GL_EXT_framebuffer_object */ - SET_GenFramebuffersEXT(table, _mesa_GenFramebuffersEXT); - SET_BindFramebufferEXT(table, _mesa_BindFramebufferEXT); - SET_DeleteFramebuffersEXT(table, _mesa_DeleteFramebuffersEXT); - SET_CheckFramebufferStatusEXT(table, _mesa_CheckFramebufferStatusEXT); - SET_GenRenderbuffersEXT(table, _mesa_GenRenderbuffersEXT); - SET_BindRenderbufferEXT(table, _mesa_BindRenderbufferEXT); - SET_DeleteRenderbuffersEXT(table, _mesa_DeleteRenderbuffersEXT); - SET_RenderbufferStorageEXT(table, _mesa_RenderbufferStorageEXT); - SET_FramebufferTexture1DEXT(table, _mesa_FramebufferTexture1DEXT); - SET_FramebufferTexture2DEXT(table, _mesa_FramebufferTexture2DEXT); - SET_FramebufferTexture3DEXT(table, _mesa_FramebufferTexture3DEXT); - SET_FramebufferRenderbufferEXT(table, _mesa_FramebufferRenderbufferEXT); - SET_GenerateMipmapEXT(table, _mesa_GenerateMipmapEXT); + SET_GenFramebuffers(table, _mesa_GenFramebuffers); + SET_BindFramebuffer(table, _mesa_BindFramebuffer); + SET_DeleteFramebuffers(table, _mesa_DeleteFramebuffers); + SET_CheckFramebufferStatus(table, _mesa_CheckFramebufferStatus); + SET_GenRenderbuffers(table, _mesa_GenRenderbuffers); + SET_BindRenderbuffer(table, _mesa_BindRenderbuffer); + SET_DeleteRenderbuffers(table, _mesa_DeleteRenderbuffers); + SET_RenderbufferStorage(table, _mesa_RenderbufferStorage); + SET_FramebufferTexture1D(table, _mesa_FramebufferTexture1D); + SET_FramebufferTexture2D(table, _mesa_FramebufferTexture2D); + SET_FramebufferTexture3D(table, _mesa_FramebufferTexture3D); + SET_FramebufferRenderbuffer(table, _mesa_FramebufferRenderbuffer); + SET_GenerateMipmap(table, _mesa_GenerateMipmap); /* 317. GL_EXT_framebuffer_multisample */ SET_RenderbufferStorageMultisample(table, _mesa_RenderbufferStorageMultisample); @@ -9987,26 +9987,26 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_DepthBoundsEXT(table, save_DepthBoundsEXT); /* ARB 1. GL_ARB_multitexture */ - SET_ActiveTextureARB(table, save_ActiveTextureARB); - SET_ClientActiveTextureARB(table, exec_ClientActiveTextureARB); + SET_ActiveTexture(table, save_ActiveTextureARB); + SET_ClientActiveTexture(table, exec_ClientActiveTextureARB); /* ARB 3. GL_ARB_transpose_matrix */ - SET_LoadTransposeMatrixdARB(table, save_LoadTransposeMatrixdARB); - SET_LoadTransposeMatrixfARB(table, save_LoadTransposeMatrixfARB); - SET_MultTransposeMatrixdARB(table, save_MultTransposeMatrixdARB); - SET_MultTransposeMatrixfARB(table, save_MultTransposeMatrixfARB); + SET_LoadTransposeMatrixd(table, save_LoadTransposeMatrixdARB); + SET_LoadTransposeMatrixf(table, save_LoadTransposeMatrixfARB); + SET_MultTransposeMatrixd(table, save_MultTransposeMatrixdARB); + SET_MultTransposeMatrixf(table, save_MultTransposeMatrixfARB); /* ARB 5. GL_ARB_multisample */ - SET_SampleCoverageARB(table, save_SampleCoverageARB); + SET_SampleCoverage(table, save_SampleCoverageARB); /* ARB 12. GL_ARB_texture_compression */ - SET_CompressedTexImage3DARB(table, save_CompressedTexImage3DARB); - SET_CompressedTexImage2DARB(table, save_CompressedTexImage2DARB); - SET_CompressedTexImage1DARB(table, save_CompressedTexImage1DARB); - SET_CompressedTexSubImage3DARB(table, save_CompressedTexSubImage3DARB); - SET_CompressedTexSubImage2DARB(table, save_CompressedTexSubImage2DARB); - SET_CompressedTexSubImage1DARB(table, save_CompressedTexSubImage1DARB); - SET_GetCompressedTexImageARB(table, exec_GetCompressedTexImageARB); + SET_CompressedTexImage3D(table, save_CompressedTexImage3DARB); + SET_CompressedTexImage2D(table, save_CompressedTexImage2DARB); + SET_CompressedTexImage1D(table, save_CompressedTexImage1DARB); + SET_CompressedTexSubImage3D(table, save_CompressedTexSubImage3DARB); + SET_CompressedTexSubImage2D(table, save_CompressedTexSubImage2DARB); + SET_CompressedTexSubImage1D(table, save_CompressedTexSubImage1DARB); + SET_GetCompressedTexImage(table, exec_GetCompressedTexImageARB); /* ARB 14. GL_ARB_point_parameters */ /* aliased with EXT_point_parameters functions */ @@ -10017,18 +10017,18 @@ _mesa_create_save_table(const struct gl_context *ctx) /* ARB 26. GL_ARB_vertex_program */ /* ARB 27. GL_ARB_fragment_program */ /* glVertexAttrib* functions alias the NV ones, handled elsewhere */ - SET_VertexAttribPointerARB(table, _mesa_VertexAttribPointerARB); - SET_EnableVertexAttribArrayARB(table, _mesa_EnableVertexAttribArrayARB); - SET_DisableVertexAttribArrayARB(table, _mesa_DisableVertexAttribArrayARB); + SET_VertexAttribPointer(table, _mesa_VertexAttribPointer); + SET_EnableVertexAttribArray(table, _mesa_EnableVertexAttribArray); + SET_DisableVertexAttribArray(table, _mesa_DisableVertexAttribArray); SET_ProgramStringARB(table, save_ProgramStringARB); - SET_BindProgramNV(table, save_BindProgramNV); - SET_DeleteProgramsNV(table, _mesa_DeletePrograms); - SET_GenProgramsNV(table, _mesa_GenPrograms); - SET_IsProgramNV(table, _mesa_IsProgramARB); - SET_GetVertexAttribdvARB(table, _mesa_GetVertexAttribdvARB); - SET_GetVertexAttribfvARB(table, _mesa_GetVertexAttribfvARB); - SET_GetVertexAttribivARB(table, _mesa_GetVertexAttribivARB); - SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervARB); + SET_BindProgramARB(table, save_BindProgramNV); + SET_DeleteProgramsARB(table, _mesa_DeleteProgramsARB); + SET_GenProgramsARB(table, _mesa_GenProgramsARB); + SET_IsProgramARB(table, _mesa_IsProgramARB); + SET_GetVertexAttribdv(table, _mesa_GetVertexAttribdv); + SET_GetVertexAttribfv(table, _mesa_GetVertexAttribfv); + SET_GetVertexAttribiv(table, _mesa_GetVertexAttribiv); + SET_GetVertexAttribPointerv(table, _mesa_GetVertexAttribPointerv); SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB); SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB); SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB); @@ -10048,49 +10048,49 @@ _mesa_create_save_table(const struct gl_context *ctx) /* ARB 28. GL_ARB_vertex_buffer_object */ /* None of the extension's functions get compiled */ - SET_BindBufferARB(table, _mesa_BindBufferARB); - SET_BufferDataARB(table, _mesa_BufferDataARB); - SET_BufferSubDataARB(table, _mesa_BufferSubDataARB); - SET_DeleteBuffersARB(table, _mesa_DeleteBuffersARB); - SET_GenBuffersARB(table, _mesa_GenBuffersARB); - SET_GetBufferParameterivARB(table, _mesa_GetBufferParameterivARB); - SET_GetBufferPointervARB(table, _mesa_GetBufferPointervARB); - SET_GetBufferSubDataARB(table, _mesa_GetBufferSubDataARB); - SET_IsBufferARB(table, _mesa_IsBufferARB); - SET_MapBufferARB(table, _mesa_MapBufferARB); - SET_UnmapBufferARB(table, _mesa_UnmapBufferARB); + SET_BindBuffer(table, _mesa_BindBuffer); + SET_BufferData(table, _mesa_BufferData); + SET_BufferSubData(table, _mesa_BufferSubData); + SET_DeleteBuffers(table, _mesa_DeleteBuffers); + SET_GenBuffers(table, _mesa_GenBuffers); + SET_GetBufferParameteriv(table, _mesa_GetBufferParameteriv); + SET_GetBufferPointerv(table, _mesa_GetBufferPointerv); + SET_GetBufferSubData(table, _mesa_GetBufferSubData); + SET_IsBuffer(table, _mesa_IsBuffer); + SET_MapBuffer(table, _mesa_MapBuffer); + SET_UnmapBuffer(table, _mesa_UnmapBuffer); _mesa_init_queryobj_dispatch(ctx, table); /* glGetQuery, etc */ - SET_BeginQueryARB(table, save_BeginQueryARB); - SET_EndQueryARB(table, save_EndQueryARB); + SET_BeginQuery(table, save_BeginQueryARB); + SET_EndQuery(table, save_EndQueryARB); SET_QueryCounter(table, save_QueryCounter); - SET_DrawBuffersARB(table, save_DrawBuffersARB); + SET_DrawBuffers(table, save_DrawBuffersARB); - SET_BlitFramebufferEXT(table, save_BlitFramebufferEXT); + SET_BlitFramebuffer(table, save_BlitFramebufferEXT); /* GL_ARB_shader_objects */ _mesa_init_shader_dispatch(ctx, table); /* Plug in glCreate/Delete/Get, etc */ - SET_UseProgramObjectARB(table, save_UseProgramObjectARB); - SET_Uniform1fARB(table, save_Uniform1fARB); - SET_Uniform2fARB(table, save_Uniform2fARB); - SET_Uniform3fARB(table, save_Uniform3fARB); - SET_Uniform4fARB(table, save_Uniform4fARB); - SET_Uniform1fvARB(table, save_Uniform1fvARB); - SET_Uniform2fvARB(table, save_Uniform2fvARB); - SET_Uniform3fvARB(table, save_Uniform3fvARB); - SET_Uniform4fvARB(table, save_Uniform4fvARB); - SET_Uniform1iARB(table, save_Uniform1iARB); - SET_Uniform2iARB(table, save_Uniform2iARB); - SET_Uniform3iARB(table, save_Uniform3iARB); - SET_Uniform4iARB(table, save_Uniform4iARB); - SET_Uniform1ivARB(table, save_Uniform1ivARB); - SET_Uniform2ivARB(table, save_Uniform2ivARB); - SET_Uniform3ivARB(table, save_Uniform3ivARB); - SET_Uniform4ivARB(table, save_Uniform4ivARB); - SET_UniformMatrix2fvARB(table, save_UniformMatrix2fvARB); - SET_UniformMatrix3fvARB(table, save_UniformMatrix3fvARB); - SET_UniformMatrix4fvARB(table, save_UniformMatrix4fvARB); + SET_UseProgram(table, save_UseProgramObjectARB); + SET_Uniform1f(table, save_Uniform1fARB); + SET_Uniform2f(table, save_Uniform2fARB); + SET_Uniform3f(table, save_Uniform3fARB); + SET_Uniform4f(table, save_Uniform4fARB); + SET_Uniform1fv(table, save_Uniform1fvARB); + SET_Uniform2fv(table, save_Uniform2fvARB); + SET_Uniform3fv(table, save_Uniform3fvARB); + SET_Uniform4fv(table, save_Uniform4fvARB); + SET_Uniform1i(table, save_Uniform1iARB); + SET_Uniform2i(table, save_Uniform2iARB); + SET_Uniform3i(table, save_Uniform3iARB); + SET_Uniform4i(table, save_Uniform4iARB); + SET_Uniform1iv(table, save_Uniform1ivARB); + SET_Uniform2iv(table, save_Uniform2ivARB); + SET_Uniform3iv(table, save_Uniform3ivARB); + SET_Uniform4iv(table, save_Uniform4ivARB); + SET_UniformMatrix2fv(table, save_UniformMatrix2fvARB); + SET_UniformMatrix3fv(table, save_UniformMatrix3fvARB); + SET_UniformMatrix4fv(table, save_UniformMatrix4fvARB); SET_UniformMatrix2x3fv(table, save_UniformMatrix2x3fv); SET_UniformMatrix3x2fv(table, save_UniformMatrix3x2fv); SET_UniformMatrix2x4fv(table, save_UniformMatrix2x4fv); @@ -10099,13 +10099,13 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_UniformMatrix4x3fv(table, save_UniformMatrix4x3fv); /* ARB 30/31/32. GL_ARB_shader_objects, GL_ARB_vertex/fragment_shader */ - SET_BindAttribLocationARB(table, exec_BindAttribLocationARB); - SET_GetAttribLocationARB(table, exec_GetAttribLocationARB); - SET_GetUniformLocationARB(table, exec_GetUniformLocationARB); + SET_BindAttribLocation(table, exec_BindAttribLocationARB); + SET_GetAttribLocation(table, exec_GetAttribLocationARB); + SET_GetUniformLocation(table, exec_GetUniformLocationARB); /* XXX additional functions need to be implemented here! */ /* 299. GL_EXT_blend_equation_separate */ - SET_BlendEquationSeparateEXT(table, save_BlendEquationSeparateEXT); + SET_BlendEquationSeparate(table, save_BlendEquationSeparateEXT); /* GL_EXT_gpu_program_parameters */ SET_ProgramEnvParameters4fvEXT(table, save_ProgramEnvParameters4fvEXT); @@ -10116,13 +10116,13 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_FlushMappedBufferRange(table, _mesa_FlushMappedBufferRange); /* no dl */ /* ARB 51. GL_ARB_texture_buffer_object */ - SET_TexBufferARB(table, _mesa_TexBuffer); /* no dlist save */ + SET_TexBuffer(table, _mesa_TexBuffer); /* no dlist save */ /* ARB 59. GL_ARB_copy_buffer */ SET_CopyBufferSubData(table, _mesa_CopyBufferSubData); /* no dlist save */ /* 364. GL_EXT_provoking_vertex */ - SET_ProvokingVertexEXT(table, save_ProvokingVertexEXT); + SET_ProvokingVertex(table, save_ProvokingVertexEXT); /* 371. GL_APPLE_object_purgeable */ SET_ObjectPurgeableAPPLE(table, _mesa_ObjectPurgeableAPPLE); @@ -10132,17 +10132,17 @@ _mesa_create_save_table(const struct gl_context *ctx) /* GL_EXT_texture_integer */ SET_ClearColorIiEXT(table, save_ClearColorIi); SET_ClearColorIuiEXT(table, save_ClearColorIui); - SET_TexParameterIivEXT(table, save_TexParameterIiv); - SET_TexParameterIuivEXT(table, save_TexParameterIuiv); - SET_GetTexParameterIivEXT(table, exec_GetTexParameterIiv); - SET_GetTexParameterIuivEXT(table, exec_GetTexParameterIuiv); + SET_TexParameterIiv(table, save_TexParameterIiv); + SET_TexParameterIuiv(table, save_TexParameterIuiv); + SET_GetTexParameterIiv(table, exec_GetTexParameterIiv); + SET_GetTexParameterIuiv(table, exec_GetTexParameterIuiv); /* 377. GL_EXT_separate_shader_objects */ SET_UseShaderProgramEXT(table, save_UseShaderProgramEXT); SET_ActiveProgramEXT(table, save_ActiveProgramEXT); /* GL_ARB_color_buffer_float */ - SET_ClampColorARB(table, save_ClampColorARB); + SET_ClampColor(table, save_ClampColorARB); /* GL 3.0 */ SET_ClearBufferiv(table, save_ClearBufferiv); @@ -10170,13 +10170,13 @@ _mesa_create_save_table(const struct gl_context *ctx) #endif /* These are not compiled into display lists: */ - SET_BindBufferBaseEXT(table, _mesa_BindBufferBase); + SET_BindBufferBase(table, _mesa_BindBufferBase); SET_BindBufferOffsetEXT(table, _mesa_BindBufferOffsetEXT); - SET_BindBufferRangeEXT(table, _mesa_BindBufferRange); - SET_TransformFeedbackVaryingsEXT(table, _mesa_TransformFeedbackVaryings); + SET_BindBufferRange(table, _mesa_BindBufferRange); + SET_TransformFeedbackVaryings(table, _mesa_TransformFeedbackVaryings); /* These are: */ - SET_BeginTransformFeedbackEXT(table, save_BeginTransformFeedback); - SET_EndTransformFeedbackEXT(table, save_EndTransformFeedback); + SET_BeginTransformFeedback(table, save_BeginTransformFeedback); + SET_EndTransformFeedback(table, save_EndTransformFeedback); SET_BindTransformFeedback(table, save_BindTransformFeedback); SET_PauseTransformFeedback(table, save_PauseTransformFeedback); SET_ResumeTransformFeedback(table, save_ResumeTransformFeedback); @@ -10190,7 +10190,7 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_EndQueryIndexed(table, save_EndQueryIndexed); /* GL_ARB_instanced_arrays */ - SET_VertexAttribDivisorARB(table, save_VertexAttribDivisor); + SET_VertexAttribDivisor(table, save_VertexAttribDivisor); /* GL_NV_texture_barrier */ SET_TextureBarrierNV(table, save_TextureBarrierNV); @@ -10217,8 +10217,8 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_FramebufferTextureFaceARB(table, save_FramebufferTextureFace); /* GL_NV_conditional_render */ - SET_BeginConditionalRenderNV(table, save_BeginConditionalRender); - SET_EndConditionalRenderNV(table, save_EndConditionalRender); + SET_BeginConditionalRender(table, save_BeginConditionalRender); + SET_EndConditionalRender(table, save_EndConditionalRender); /* GL_ARB_sync */ _mesa_init_sync_dispatch(table); @@ -10239,7 +10239,7 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_UniformBlockBinding(table, save_UniformBlockBinding); /* GL_NV_primitive_restart */ - SET_PrimitiveRestartIndexNV(table, _mesa_PrimitiveRestartIndex); + SET_PrimitiveRestartIndex(table, _mesa_PrimitiveRestartIndex); return table; } diff --git a/src/mesa/main/drawtex.c b/src/mesa/main/drawtex.c index d5cac22bd3b..7285805c871 100644 --- a/src/mesa/main/drawtex.c +++ b/src/mesa/main/drawtex.c @@ -55,7 +55,7 @@ draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, void GLAPIENTRY -_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) +_mesa_DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, x, y, z, width, height); @@ -63,7 +63,7 @@ _mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) void GLAPIENTRY -_mesa_DrawTexfv(const GLfloat *coords) +_mesa_DrawTexfvOES(const GLfloat *coords) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]); @@ -71,7 +71,7 @@ _mesa_DrawTexfv(const GLfloat *coords) void GLAPIENTRY -_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height) +_mesa_DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z, @@ -80,7 +80,7 @@ _mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height) void GLAPIENTRY -_mesa_DrawTexiv(const GLint *coords) +_mesa_DrawTexivOES(const GLint *coords) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1], @@ -89,7 +89,7 @@ _mesa_DrawTexiv(const GLint *coords) void GLAPIENTRY -_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height) +_mesa_DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z, @@ -98,7 +98,7 @@ _mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height) void GLAPIENTRY -_mesa_DrawTexsv(const GLshort *coords) +_mesa_DrawTexsvOES(const GLshort *coords) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1], diff --git a/src/mesa/main/drawtex.h b/src/mesa/main/drawtex.h index 938b65fb2e9..b916150b7c2 100644 --- a/src/mesa/main/drawtex.h +++ b/src/mesa/main/drawtex.h @@ -30,22 +30,22 @@ extern void GLAPIENTRY -_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); +_mesa_DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); extern void GLAPIENTRY -_mesa_DrawTexfv(const GLfloat *coords); +_mesa_DrawTexfvOES(const GLfloat *coords); extern void GLAPIENTRY -_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height); +_mesa_DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height); extern void GLAPIENTRY -_mesa_DrawTexiv(const GLint *coords); +_mesa_DrawTexivOES(const GLint *coords); extern void GLAPIENTRY -_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); +_mesa_DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); extern void GLAPIENTRY -_mesa_DrawTexsv(const GLshort *coords); +_mesa_DrawTexsvOES(const GLshort *coords); extern void GLAPIENTRY _mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index e704f2f2da2..c7114b73a67 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -1072,7 +1072,7 @@ invalid_enum_error: void GLAPIENTRY -_mesa_DisableIndexed( GLenum cap, GLuint index ) +_mesa_Disablei( GLenum cap, GLuint index ) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -1081,7 +1081,7 @@ _mesa_DisableIndexed( GLenum cap, GLuint index ) void GLAPIENTRY -_mesa_EnableIndexed( GLenum cap, GLuint index ) +_mesa_Enablei( GLenum cap, GLuint index ) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -1090,7 +1090,7 @@ _mesa_EnableIndexed( GLenum cap, GLuint index ) GLboolean GLAPIENTRY -_mesa_IsEnabledIndexed( GLenum cap, GLuint index ) +_mesa_IsEnabledi( GLenum cap, GLuint index ) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0); diff --git a/src/mesa/main/enable.h b/src/mesa/main/enable.h index be790945920..5b2515d593d 100644 --- a/src/mesa/main/enable.h +++ b/src/mesa/main/enable.h @@ -53,13 +53,13 @@ extern void _mesa_set_enablei(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state); extern void GLAPIENTRY -_mesa_DisableIndexed( GLenum cap, GLuint index ); +_mesa_Disablei( GLenum cap, GLuint index ); extern void GLAPIENTRY -_mesa_EnableIndexed( GLenum cap, GLuint index ); +_mesa_Enablei( GLenum cap, GLuint index ); extern GLboolean GLAPIENTRY -_mesa_IsEnabledIndexed( GLenum cap, GLuint index ); +_mesa_IsEnabledi( GLenum cap, GLuint index ); extern void GLAPIENTRY _mesa_EnableClientState( GLenum cap ); diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c index 993147c4760..cd527dd78f0 100644 --- a/src/mesa/main/es1_conversion.c +++ b/src/mesa/main/es1_conversion.c @@ -30,13 +30,13 @@ #include "main/es1_conversion.h" void GL_APIENTRY -_es_AlphaFuncx(GLenum func, GLclampx ref) +_mesa_AlphaFuncx(GLenum func, GLclampx ref) { _mesa_AlphaFunc(func, (GLclampf) (ref / 65536.0f)); } void GL_APIENTRY -_es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha) +_mesa_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha) { _mesa_ClearColor((GLclampf) (red / 65536.0f), (GLclampf) (green / 65536.0f), @@ -45,13 +45,13 @@ _es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha) } void GL_APIENTRY -_es_ClearDepthx(GLclampx depth) +_mesa_ClearDepthx(GLclampx depth) { _mesa_ClearDepthf((GLclampf) (depth / 65536.0f)); } void GL_APIENTRY -_es_ClipPlanef(GLenum plane, const GLfloat *equation) +_mesa_ClipPlanef(GLenum plane, const GLfloat *equation) { unsigned int i; GLdouble converted_equation[4]; @@ -64,7 +64,7 @@ _es_ClipPlanef(GLenum plane, const GLfloat *equation) } void GL_APIENTRY -_es_ClipPlanex(GLenum plane, const GLfixed *equation) +_mesa_ClipPlanex(GLenum plane, const GLfixed *equation) { unsigned int i; GLdouble converted_equation[4]; @@ -86,7 +86,7 @@ _es_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha) } void GL_APIENTRY -_es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) +_mesa_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) { _es_Color4f((GLfloat) (red / 65536.0f), (GLfloat) (green / 65536.0f), @@ -95,17 +95,17 @@ _es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) } void GL_APIENTRY -_es_DepthRangex(GLclampx zNear, GLclampx zFar) +_mesa_DepthRangex(GLclampx zNear, GLclampx zFar) { _mesa_DepthRangef((GLclampf) (zNear / 65536.0f), (GLclampf) (zFar / 65536.0f)); } void GL_APIENTRY -_es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h) +_mesa_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h) { - _mesa_DrawTexf((GLfloat) (x / 65536.0f), + _mesa_DrawTexfOES((GLfloat) (x / 65536.0f), (GLfloat) (y / 65536.0f), (GLfloat) (z / 65536.0f), (GLfloat) (w / 65536.0f), @@ -113,7 +113,7 @@ _es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h) } void GL_APIENTRY -_es_DrawTexxvOES(const GLfixed *coords) +_mesa_DrawTexxvOES(const GLfixed *coords) { unsigned int i; GLfloat converted_coords[5]; @@ -122,11 +122,11 @@ _es_DrawTexxvOES(const GLfixed *coords) converted_coords[i] = (GLfloat) (coords[i] / 65536.0f); } - _mesa_DrawTexfv(converted_coords); + _mesa_DrawTexfvOES(converted_coords); } void GL_APIENTRY -_es_Fogx(GLenum pname, GLfixed param) +_mesa_Fogx(GLenum pname, GLfixed param) { if (pname != GL_FOG_MODE) { _mesa_Fogf(pname, (GLfloat) (param / 65536.0f)); @@ -137,7 +137,7 @@ _es_Fogx(GLenum pname, GLfixed param) } void GL_APIENTRY -_es_Fogxv(GLenum pname, const GLfixed *params) +_mesa_Fogxv(GLenum pname, const GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -177,7 +177,7 @@ _es_Fogxv(GLenum pname, const GLfixed *params) } void GL_APIENTRY -_es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, +_mesa_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar) { _mesa_Frustum((GLdouble) (left), @@ -189,7 +189,7 @@ _es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, } void GL_APIENTRY -_es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, +_mesa_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar) { _mesa_Frustum((GLdouble) (left / 65536.0), @@ -201,7 +201,7 @@ _es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, } void GL_APIENTRY -_es_GetClipPlanef(GLenum plane, GLfloat *equation) +_mesa_GetClipPlanef(GLenum plane, GLfloat *equation) { unsigned int i; GLdouble converted_equation[4]; @@ -213,7 +213,7 @@ _es_GetClipPlanef(GLenum plane, GLfloat *equation) } void GL_APIENTRY -_es_GetClipPlanex(GLenum plane, GLfixed *equation) +_mesa_GetClipPlanex(GLenum plane, GLfixed *equation) { unsigned int i; GLdouble converted_equation[4]; @@ -225,7 +225,7 @@ _es_GetClipPlanex(GLenum plane, GLfixed *equation) } void GL_APIENTRY -_es_GetLightxv(GLenum light, GLenum pname, GLfixed *params) +_mesa_GetLightxv(GLenum light, GLenum pname, GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -266,7 +266,7 @@ _es_GetLightxv(GLenum light, GLenum pname, GLfixed *params) } void GL_APIENTRY -_es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params) +_mesa_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -304,7 +304,7 @@ _es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params) } void GL_APIENTRY -_es_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params) +_mesa_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -396,13 +396,13 @@ _check_GetTexGenivOES(GLenum coord, GLenum pname, GLint *params) } void GL_APIENTRY -_check_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params) +_mesa_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params) { _mesa_GetTexGeniv(coord, pname, (GLint *) params); } void GL_APIENTRY -_es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params) +_mesa_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -450,13 +450,13 @@ _es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params) } void GL_APIENTRY -_es_LightModelx(GLenum pname, GLfixed param) +_mesa_LightModelx(GLenum pname, GLfixed param) { _mesa_LightModelf(pname, (GLfloat) param); } void GL_APIENTRY -_es_LightModelxv(GLenum pname, const GLfixed *params) +_mesa_LightModelxv(GLenum pname, const GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -491,13 +491,13 @@ _es_LightModelxv(GLenum pname, const GLfixed *params) } void GL_APIENTRY -_es_Lightx(GLenum light, GLenum pname, GLfixed param) +_mesa_Lightx(GLenum light, GLenum pname, GLfixed param) { _mesa_Lightf(light, pname, (GLfloat) (param / 65536.0f)); } void GL_APIENTRY -_es_Lightxv(GLenum light, GLenum pname, const GLfixed *params) +_mesa_Lightxv(GLenum light, GLenum pname, const GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -539,13 +539,13 @@ _es_Lightxv(GLenum light, GLenum pname, const GLfixed *params) } void GL_APIENTRY -_es_LineWidthx(GLfixed width) +_mesa_LineWidthx(GLfixed width) { _mesa_LineWidth((GLfloat) (width / 65536.0f)); } void GL_APIENTRY -_es_LoadMatrixx(const GLfixed *m) +_mesa_LoadMatrixx(const GLfixed *m) { unsigned int i; GLfloat converted_m[16]; @@ -558,7 +558,7 @@ _es_LoadMatrixx(const GLfixed *m) } void GL_APIENTRY -_es_Materialx(GLenum face, GLenum pname, GLfixed param) +_mesa_Materialx(GLenum face, GLenum pname, GLfixed param) { if (face != GL_FRONT_AND_BACK) { _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM, @@ -576,7 +576,7 @@ _es_Materialx(GLenum face, GLenum pname, GLfixed param) } void GL_APIENTRY -_es_Materialxv(GLenum face, GLenum pname, const GLfixed *params) +_mesa_Materialxv(GLenum face, GLenum pname, const GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -613,7 +613,7 @@ _es_Materialxv(GLenum face, GLenum pname, const GLfixed *params) } void GL_APIENTRY -_es_MultMatrixx(const GLfixed *m) +_mesa_MultMatrixx(const GLfixed *m) { unsigned int i; GLfloat converted_m[16]; @@ -626,7 +626,7 @@ _es_MultMatrixx(const GLfixed *m) } void GL_APIENTRY -_es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q) +_mesa_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q) { _es_MultiTexCoord4f(texture, (GLfloat) (s / 65536.0f), @@ -636,7 +636,7 @@ _es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q) } void GL_APIENTRY -_es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz) +_mesa_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz) { _es_Normal3f((GLfloat) (nx / 65536.0f), (GLfloat) (ny / 65536.0f), @@ -644,7 +644,7 @@ _es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz) } void GL_APIENTRY -_es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, +_mesa_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar) { _mesa_Ortho((GLdouble) (left), @@ -656,7 +656,7 @@ _es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, } void GL_APIENTRY -_es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, +_mesa_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar) { _mesa_Ortho((GLdouble) (left / 65536.0), @@ -668,13 +668,13 @@ _es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, } void GL_APIENTRY -_es_PointParameterx(GLenum pname, GLfixed param) +_mesa_PointParameterx(GLenum pname, GLfixed param) { _mesa_PointParameterf(pname, (GLfloat) (param / 65536.0f)); } void GL_APIENTRY -_es_PointParameterxv(GLenum pname, const GLfixed *params) +_mesa_PointParameterxv(GLenum pname, const GLfixed *params) { unsigned int i; unsigned int n_params = 3; @@ -703,20 +703,20 @@ _es_PointParameterxv(GLenum pname, const GLfixed *params) } void GL_APIENTRY -_es_PointSizex(GLfixed size) +_mesa_PointSizex(GLfixed size) { _mesa_PointSize((GLfloat) (size / 65536.0f)); } void GL_APIENTRY -_es_PolygonOffsetx(GLfixed factor, GLfixed units) +_mesa_PolygonOffsetx(GLfixed factor, GLfixed units) { _mesa_PolygonOffset((GLfloat) (factor / 65536.0f), (GLfloat) (units / 65536.0f)); } void GL_APIENTRY -_es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z) +_mesa_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z) { _mesa_Rotatef((GLfloat) (angle / 65536.0f), (GLfloat) (x / 65536.0f), @@ -725,14 +725,14 @@ _es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z) } void GL_APIENTRY -_es_SampleCoveragex(GLclampx value, GLboolean invert) +_mesa_SampleCoveragex(GLclampx value, GLboolean invert) { - _mesa_SampleCoverageARB((GLclampf) (value / 65536.0f), + _mesa_SampleCoverage((GLclampf) (value / 65536.0f), invert); } void GL_APIENTRY -_es_Scalex(GLfixed x, GLfixed y, GLfixed z) +_mesa_Scalex(GLfixed x, GLfixed y, GLfixed z) { _mesa_Scalef((GLfloat) (x / 65536.0f), (GLfloat) (y / 65536.0f), @@ -740,7 +740,7 @@ _es_Scalex(GLfixed x, GLfixed y, GLfixed z) } void GL_APIENTRY -_es_TexEnvx(GLenum target, GLenum pname, GLfixed param) +_mesa_TexEnvx(GLenum target, GLenum pname, GLfixed param) { switch(target) { case GL_POINT_SPRITE: @@ -785,7 +785,7 @@ _es_TexEnvx(GLenum target, GLenum pname, GLfixed param) } void GL_APIENTRY -_es_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params) +_mesa_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params) { switch(target) { case GL_POINT_SPRITE: @@ -853,19 +853,19 @@ _check_TexGenivOES(GLenum coord, GLenum pname, const GLint *params) } void GL_APIENTRY -_check_TexGenxOES(GLenum coord, GLenum pname, GLfixed param) +_mesa_TexGenxOES(GLenum coord, GLenum pname, GLfixed param) { _es_TexGenf(coord, pname, (GLfloat) param); } void GL_APIENTRY -_check_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params) +_mesa_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params) { _es_TexGenf(coord, pname, (GLfloat) params[0]); } void GL_APIENTRY -_es_TexParameterx(GLenum target, GLenum pname, GLfixed param) +_mesa_TexParameterx(GLenum target, GLenum pname, GLfixed param) { if (pname == GL_TEXTURE_MAX_ANISOTROPY_EXT) { _mesa_TexParameterf(target, pname, (GLfloat) (param / 65536.0f)); @@ -875,7 +875,7 @@ _es_TexParameterx(GLenum target, GLenum pname, GLfixed param) } void GL_APIENTRY -_es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params) +_mesa_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -930,7 +930,7 @@ _es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params) } void GL_APIENTRY -_es_Translatex(GLfixed x, GLfixed y, GLfixed z) +_mesa_Translatex(GLfixed x, GLfixed y, GLfixed z) { _mesa_Translatef((GLfloat) (x / 65536.0f), (GLfloat) (y / 65536.0f), diff --git a/src/mesa/main/es1_conversion.h b/src/mesa/main/es1_conversion.h index eb073475992..868a75bab9b 100644 --- a/src/mesa/main/es1_conversion.h +++ b/src/mesa/main/es1_conversion.h @@ -29,140 +29,140 @@ #endif void GL_APIENTRY -_es_AlphaFuncx(GLenum func, GLclampx ref); +_mesa_AlphaFuncx(GLenum func, GLclampx ref); void GL_APIENTRY -_es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); +_mesa_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); void GL_APIENTRY -_es_ClearDepthx(GLclampx depth); +_mesa_ClearDepthx(GLclampx depth); void GL_APIENTRY -_es_ClipPlanef(GLenum plane, const GLfloat *equation); +_mesa_ClipPlanef(GLenum plane, const GLfloat *equation); void GL_APIENTRY -_es_ClipPlanex(GLenum plane, const GLfixed *equation); +_mesa_ClipPlanex(GLenum plane, const GLfixed *equation); void GL_APIENTRY _es_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); void GL_APIENTRY -_es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); +_mesa_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); void GL_APIENTRY -_es_DepthRangex(GLclampx zNear, GLclampx zFar); +_mesa_DepthRangex(GLclampx zNear, GLclampx zFar); void GL_APIENTRY -_es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h); +_mesa_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h); void GL_APIENTRY -_es_DrawTexxvOES(const GLfixed *coords); +_mesa_DrawTexxvOES(const GLfixed *coords); void GL_APIENTRY -_es_Fogx(GLenum pname, GLfixed param); +_mesa_Fogx(GLenum pname, GLfixed param); void GL_APIENTRY -_es_Fogxv(GLenum pname, const GLfixed *params); +_mesa_Fogxv(GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, +_mesa_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); void GL_APIENTRY -_es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, +_mesa_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); void GL_APIENTRY -_es_GetClipPlanef(GLenum plane, GLfloat *equation); +_mesa_GetClipPlanef(GLenum plane, GLfloat *equation); void GL_APIENTRY -_es_GetClipPlanex(GLenum plane, GLfixed *equation); +_mesa_GetClipPlanex(GLenum plane, GLfixed *equation); void GL_APIENTRY -_es_GetLightxv(GLenum light, GLenum pname, GLfixed *params); +_mesa_GetLightxv(GLenum light, GLenum pname, GLfixed *params); void GL_APIENTRY -_es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params); +_mesa_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params); void GL_APIENTRY _check_GetTexGenivOES(GLenum coord, GLenum pname, GLint *params); void GL_APIENTRY -_es_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params); +_mesa_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params); void GL_APIENTRY -_check_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params); +_mesa_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params); void GL_APIENTRY -_es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params); +_mesa_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params); void GL_APIENTRY -_es_LightModelx(GLenum pname, GLfixed param); +_mesa_LightModelx(GLenum pname, GLfixed param); void GL_APIENTRY -_es_LightModelxv(GLenum pname, const GLfixed *params); +_mesa_LightModelxv(GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_Lightx(GLenum light, GLenum pname, GLfixed param); +_mesa_Lightx(GLenum light, GLenum pname, GLfixed param); void GL_APIENTRY -_es_Lightxv(GLenum light, GLenum pname, const GLfixed *params); +_mesa_Lightxv(GLenum light, GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_LineWidthx(GLfixed width); +_mesa_LineWidthx(GLfixed width); void GL_APIENTRY -_es_LoadMatrixx(const GLfixed *m); +_mesa_LoadMatrixx(const GLfixed *m); void GL_APIENTRY -_es_Materialx(GLenum face, GLenum pname, GLfixed param); +_mesa_Materialx(GLenum face, GLenum pname, GLfixed param); void GL_APIENTRY -_es_Materialxv(GLenum face, GLenum pname, const GLfixed *params); +_mesa_Materialxv(GLenum face, GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_MultMatrixx(const GLfixed *m); +_mesa_MultMatrixx(const GLfixed *m); void GL_APIENTRY -_es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q); +_mesa_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q); void GL_APIENTRY -_es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz); +_mesa_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz); void GL_APIENTRY -_es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, +_mesa_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); void GL_APIENTRY -_es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, +_mesa_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); void GL_APIENTRY -_es_PointParameterx(GLenum pname, GLfixed param); +_mesa_PointParameterx(GLenum pname, GLfixed param); void GL_APIENTRY -_es_PointParameterxv(GLenum pname, const GLfixed *params); +_mesa_PointParameterxv(GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_PointSizex(GLfixed size); +_mesa_PointSizex(GLfixed size); void GL_APIENTRY -_es_PolygonOffsetx(GLfixed factor, GLfixed units); +_mesa_PolygonOffsetx(GLfixed factor, GLfixed units); void GL_APIENTRY -_es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); +_mesa_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); void GL_APIENTRY -_es_SampleCoveragex(GLclampx value, GLboolean invert); +_mesa_SampleCoveragex(GLclampx value, GLboolean invert); void GL_APIENTRY -_es_Scalex(GLfixed x, GLfixed y, GLfixed z); +_mesa_Scalex(GLfixed x, GLfixed y, GLfixed z); void GL_APIENTRY -_es_TexEnvx(GLenum target, GLenum pname, GLfixed param); +_mesa_TexEnvx(GLenum target, GLenum pname, GLfixed param); void GL_APIENTRY -_es_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params); +_mesa_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params); void GL_APIENTRY _check_TexGeniOES(GLenum coord, GLenum pname, GLint param); @@ -171,18 +171,18 @@ void GL_APIENTRY _check_TexGenivOES(GLenum coord, GLenum pname, const GLint *params); void GL_APIENTRY -_check_TexGenxOES(GLenum coord, GLenum pname, GLfixed param); +_mesa_TexGenxOES(GLenum coord, GLenum pname, GLfixed param); void GL_APIENTRY -_check_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params); +_mesa_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_TexParameterx(GLenum target, GLenum pname, GLfixed param); +_mesa_TexParameterx(GLenum target, GLenum pname, GLfixed param); void GL_APIENTRY -_es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params); +_mesa_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_Translatex(GLfixed x, GLfixed y, GLfixed z); +_mesa_Translatex(GLfixed x, GLfixed y, GLfixed z); #endif /* ES1_CONVERSION_H */ diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 0618b7fabec..ef739c162c4 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -883,7 +883,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, GLboolean GLAPIENTRY -_mesa_IsRenderbufferEXT(GLuint renderbuffer) +_mesa_IsRenderbuffer(GLuint renderbuffer) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); @@ -897,7 +897,7 @@ _mesa_IsRenderbufferEXT(GLuint renderbuffer) void GLAPIENTRY -_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer) +_mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer) { struct gl_renderbuffer *newRb; GET_CURRENT_CONTEXT(ctx); @@ -969,7 +969,7 @@ detach_renderbuffer(struct gl_context *ctx, void GLAPIENTRY -_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers) +_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers) { GLint i; GET_CURRENT_CONTEXT(ctx); @@ -986,7 +986,7 @@ _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers) if (rb == ctx->CurrentRenderbuffer) { /* bind default */ ASSERT(rb->RefCount >= 2); - _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0); + _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, 0); } if (_mesa_is_user_fbo(ctx->DrawBuffer)) { @@ -1014,7 +1014,7 @@ _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers) void GLAPIENTRY -_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers) +_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers) { GET_CURRENT_CONTEXT(ctx); GLuint first; @@ -1398,9 +1398,9 @@ invalidate_rb(GLuint key, void *data, void *userData) /** - * Helper function used by _mesa_RenderbufferStorageEXT() and + * Helper function used by _mesa_RenderbufferStorage() and * _mesa_RenderbufferStorageMultisample(). - * samples will be NO_SAMPLES if called by _mesa_RenderbufferStorageEXT(). + * samples will be NO_SAMPLES if called by _mesa_RenderbufferStorage(). */ static void renderbuffer_storage(GLenum target, GLenum internalFormat, @@ -1526,8 +1526,8 @@ _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image) /** - * Helper function for _mesa_GetRenderbufferParameterivEXT() and - * _mesa_GetFramebufferAttachmentParameterivEXT() + * Helper function for _mesa_GetRenderbufferParameteriv() and + * _mesa_GetFramebufferAttachmentParameteriv() * We have to be careful to respect the base format. For example, if a * renderbuffer/texture was created with internalFormat=GL_RGB but the * driver actually chose a GL_RGBA format, when the user queries ALPHA_SIZE @@ -1545,7 +1545,7 @@ get_component_bits(GLenum pname, GLenum baseFormat, gl_format format) void GLAPIENTRY -_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat, +_mesa_RenderbufferStorage(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height) { /* GL_ARB_fbo says calling this function is equivalent to calling @@ -1587,7 +1587,7 @@ _es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat, void GLAPIENTRY -_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params) +_mesa_GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params) { struct gl_renderbuffer *rb; GET_CURRENT_CONTEXT(ctx); @@ -1645,7 +1645,7 @@ _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params) GLboolean GLAPIENTRY -_mesa_IsFramebufferEXT(GLuint framebuffer) +_mesa_IsFramebuffer(GLuint framebuffer) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); @@ -1705,7 +1705,7 @@ check_end_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb) void GLAPIENTRY -_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer) +_mesa_BindFramebuffer(GLenum target, GLuint framebuffer) { struct gl_framebuffer *newDrawFb, *newReadFb; struct gl_framebuffer *oldDrawFb, *oldReadFb; @@ -1839,7 +1839,7 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer) void GLAPIENTRY -_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers) +_mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers) { GLint i; GET_CURRENT_CONTEXT(ctx); @@ -1860,12 +1860,12 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers) if (fb == ctx->DrawBuffer) { /* bind default */ ASSERT(fb->RefCount >= 2); - _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0); + _mesa_BindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, 0); } if (fb == ctx->ReadBuffer) { /* bind default */ ASSERT(fb->RefCount >= 2); - _mesa_BindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0); + _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER_EXT, 0); } } else { @@ -1873,7 +1873,7 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers) if (fb == ctx->DrawBuffer || fb == ctx->ReadBuffer) { /* bind default */ ASSERT(fb->RefCount >= 2); - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, 0); } } @@ -1893,7 +1893,7 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers) void GLAPIENTRY -_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers) +_mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers) { GET_CURRENT_CONTEXT(ctx); GLuint first; @@ -1924,7 +1924,7 @@ _mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers) GLenum GLAPIENTRY -_mesa_CheckFramebufferStatusEXT(GLenum target) +_mesa_CheckFramebufferStatus(GLenum target) { struct gl_framebuffer *buffer; GET_CURRENT_CONTEXT(ctx); @@ -2151,7 +2151,7 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target, void GLAPIENTRY -_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) { GET_CURRENT_CONTEXT(ctx); @@ -2184,7 +2184,7 @@ _mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment, void GLAPIENTRY -_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) { GET_CURRENT_CONTEXT(ctx); @@ -2230,7 +2230,7 @@ _mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment, void GLAPIENTRY -_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset) { @@ -2248,7 +2248,7 @@ _mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment, void GLAPIENTRY -_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer) { GET_CURRENT_CONTEXT(ctx); @@ -2259,7 +2259,7 @@ _mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment, void GLAPIENTRY -_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment, +_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbufferTarget, GLuint renderbuffer) { @@ -2343,7 +2343,7 @@ _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment, void GLAPIENTRY -_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment, +_mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params) { const struct gl_renderbuffer_attachment *att; @@ -2575,7 +2575,7 @@ invalid_pname_enum: void GLAPIENTRY -_mesa_GenerateMipmapEXT(GLenum target) +_mesa_GenerateMipmap(GLenum target) { struct gl_texture_image *srcImage; struct gl_texture_object *texObj; @@ -2833,7 +2833,7 @@ compatible_resolve_formats(const struct gl_renderbuffer *colorReadRb, * when the samples must be resolved to a single color. */ void GLAPIENTRY -_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, +_mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) { diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h index 44d92d42156..9207f59c789 100644 --- a/src/mesa/main/fbobject.h +++ b/src/mesa/main/fbobject.h @@ -124,19 +124,19 @@ extern GLenum _mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat); extern GLboolean GLAPIENTRY -_mesa_IsRenderbufferEXT(GLuint renderbuffer); +_mesa_IsRenderbuffer(GLuint renderbuffer); extern void GLAPIENTRY -_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer); +_mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer); extern void GLAPIENTRY -_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers); +_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers); extern void GLAPIENTRY -_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers); +_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers); extern void GLAPIENTRY -_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat, +_mesa_RenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); extern void GLAPIENTRY @@ -152,56 +152,56 @@ extern void GLAPIENTRY _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image); extern void GLAPIENTRY -_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, +_mesa_GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params); extern GLboolean GLAPIENTRY -_mesa_IsFramebufferEXT(GLuint framebuffer); +_mesa_IsFramebuffer(GLuint framebuffer); extern void GLAPIENTRY -_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer); +_mesa_BindFramebuffer(GLenum target, GLuint framebuffer); extern void GLAPIENTRY -_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers); +_mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers); extern void GLAPIENTRY -_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers); +_mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers); extern GLenum GLAPIENTRY -_mesa_CheckFramebufferStatusEXT(GLenum target); +_mesa_CheckFramebufferStatus(GLenum target); extern void GLAPIENTRY -_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); extern void GLAPIENTRY -_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); extern void GLAPIENTRY -_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); extern void GLAPIENTRY -_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); extern void GLAPIENTRY -_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment, +_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); extern void GLAPIENTRY -_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment, +_mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params); extern void GLAPIENTRY -_mesa_GenerateMipmapEXT(GLenum target); +_mesa_GenerateMipmap(GLenum target); extern void GLAPIENTRY -_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, +_mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 39709b80894..e1ebd18569f 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1614,7 +1614,7 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) } void GLAPIENTRY -_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params ) +_mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params ) { union value v; enum value_type type = @@ -1639,7 +1639,7 @@ _mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params ) } void GLAPIENTRY -_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params ) +_mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params ) { union value v; enum value_type type = diff --git a/src/mesa/main/get.h b/src/mesa/main/get.h index 9422efec565..4daa1aec117 100644 --- a/src/mesa/main/get.h +++ b/src/mesa/main/get.h @@ -54,10 +54,10 @@ extern void GLAPIENTRY _mesa_GetFixedv(GLenum pname, GLfixed *params); extern void GLAPIENTRY -_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params ); +_mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params ); extern void GLAPIENTRY -_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params ); +_mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params ); extern void GLAPIENTRY _mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params ); diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index 042ed1cb858..b0a10e9edd8 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -66,7 +66,7 @@ _mesa_ShadeModel( GLenum mode ) * triangle or line. */ void GLAPIENTRY -_mesa_ProvokingVertexEXT(GLenum mode) +_mesa_ProvokingVertex(GLenum mode) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h index 2e6a5003ece..e25dbf226ec 100644 --- a/src/mesa/main/light.h +++ b/src/mesa/main/light.h @@ -39,7 +39,7 @@ extern void GLAPIENTRY _mesa_ShadeModel( GLenum mode ); extern void GLAPIENTRY -_mesa_ProvokingVertexEXT(GLenum mode); +_mesa_ProvokingVertex(GLenum mode); extern void GLAPIENTRY diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c index 3c5968c853f..00b8e00b75e 100644 --- a/src/mesa/main/matrix.c +++ b/src/mesa/main/matrix.c @@ -489,7 +489,7 @@ _mesa_Translated( GLdouble x, GLdouble y, GLdouble z ) void GLAPIENTRY -_mesa_LoadTransposeMatrixfARB( const GLfloat *m ) +_mesa_LoadTransposeMatrixf( const GLfloat *m ) { GLfloat tm[16]; if (!m) return; @@ -499,7 +499,7 @@ _mesa_LoadTransposeMatrixfARB( const GLfloat *m ) void GLAPIENTRY -_mesa_LoadTransposeMatrixdARB( const GLdouble *m ) +_mesa_LoadTransposeMatrixd( const GLdouble *m ) { GLfloat tm[16]; if (!m) return; @@ -509,7 +509,7 @@ _mesa_LoadTransposeMatrixdARB( const GLdouble *m ) void GLAPIENTRY -_mesa_MultTransposeMatrixfARB( const GLfloat *m ) +_mesa_MultTransposeMatrixf( const GLfloat *m ) { GLfloat tm[16]; if (!m) return; @@ -519,7 +519,7 @@ _mesa_MultTransposeMatrixfARB( const GLfloat *m ) void GLAPIENTRY -_mesa_MultTransposeMatrixdARB( const GLdouble *m ) +_mesa_MultTransposeMatrixd( const GLdouble *m ) { GLfloat tm[16]; if (!m) return; diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h index 2878cc134b5..185a5c04b1b 100644 --- a/src/mesa/main/matrix.h +++ b/src/mesa/main/matrix.h @@ -85,16 +85,16 @@ extern void GLAPIENTRY _mesa_Translated( GLdouble x, GLdouble y, GLdouble z ); extern void GLAPIENTRY -_mesa_LoadTransposeMatrixfARB( const GLfloat *m ); +_mesa_LoadTransposeMatrixf( const GLfloat *m ); extern void GLAPIENTRY -_mesa_LoadTransposeMatrixdARB( const GLdouble *m ); +_mesa_LoadTransposeMatrixd( const GLdouble *m ); extern void GLAPIENTRY -_mesa_MultTransposeMatrixfARB( const GLfloat *m ); +_mesa_MultTransposeMatrixf( const GLfloat *m ); extern void GLAPIENTRY -_mesa_MultTransposeMatrixdARB( const GLdouble *m ); +_mesa_MultTransposeMatrixd( const GLdouble *m ); extern void diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c index 67fdb8c9db9..347e98e4eda 100644 --- a/src/mesa/main/multisample.c +++ b/src/mesa/main/multisample.c @@ -34,7 +34,7 @@ * Called via glSampleCoverageARB */ void GLAPIENTRY -_mesa_SampleCoverageARB(GLclampf value, GLboolean invert) +_mesa_SampleCoverage(GLclampf value, GLboolean invert) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/multisample.h b/src/mesa/main/multisample.h index e86d4092bc9..30726c34cf1 100644 --- a/src/mesa/main/multisample.h +++ b/src/mesa/main/multisample.h @@ -31,7 +31,7 @@ struct gl_context; extern void GLAPIENTRY -_mesa_SampleCoverageARB(GLclampf value, GLboolean invert); +_mesa_SampleCoverage(GLclampf value, GLboolean invert); extern void diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c index 63d1d8e26c0..aee8aef129e 100644 --- a/src/mesa/main/querymatrix.c +++ b/src/mesa/main/querymatrix.c @@ -89,7 +89,7 @@ fpclassify(double x) #endif -GLbitfield GLAPIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]) +GLbitfield GLAPIENTRY _mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]) { GLfloat matrix[16]; GLint tmp; diff --git a/src/mesa/main/querymatrix.h b/src/mesa/main/querymatrix.h index 37a22e961e6..187b5f48602 100644 --- a/src/mesa/main/querymatrix.h +++ b/src/mesa/main/querymatrix.h @@ -34,6 +34,6 @@ */ extern GLbitfield GLAPIENTRY -_es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]); +_mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]); #endif diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index a22425ab0bd..dbf40d0510a 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -169,7 +169,7 @@ get_query_binding_point(struct gl_context *ctx, GLenum target) void GLAPIENTRY -_mesa_GenQueriesARB(GLsizei n, GLuint *ids) +_mesa_GenQueries(GLsizei n, GLuint *ids) { GLuint first; GET_CURRENT_CONTEXT(ctx); @@ -208,7 +208,7 @@ _mesa_GenQueriesARB(GLsizei n, GLuint *ids) void GLAPIENTRY -_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids) +_mesa_DeleteQueries(GLsizei n, const GLuint *ids) { GLint i; GET_CURRENT_CONTEXT(ctx); @@ -244,7 +244,7 @@ _mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids) GLboolean GLAPIENTRY -_mesa_IsQueryARB(GLuint id) +_mesa_IsQuery(GLuint id) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); @@ -403,13 +403,13 @@ _mesa_EndQueryIndexed(GLenum target, GLuint index) } void GLAPIENTRY -_mesa_BeginQueryARB(GLenum target, GLuint id) +_mesa_BeginQuery(GLenum target, GLuint id) { _mesa_BeginQueryIndexed(target, 0, id); } void GLAPIENTRY -_mesa_EndQueryARB(GLenum target) +_mesa_EndQuery(GLenum target) { _mesa_EndQueryIndexed(target, 0); } @@ -547,13 +547,13 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname, } void GLAPIENTRY -_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params) +_mesa_GetQueryiv(GLenum target, GLenum pname, GLint *params) { _mesa_GetQueryIndexediv(target, 0, pname, params); } void GLAPIENTRY -_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params) +_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params) { struct gl_query_object *q = NULL; GET_CURRENT_CONTEXT(ctx); @@ -604,7 +604,7 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params) void GLAPIENTRY -_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params) +_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params) { struct gl_query_object *q = NULL; GET_CURRENT_CONTEXT(ctx); @@ -658,7 +658,7 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params) * New with GL_EXT_timer_query */ void GLAPIENTRY -_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params) +_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params) { struct gl_query_object *q = NULL; GET_CURRENT_CONTEXT(ctx); @@ -699,7 +699,7 @@ _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params) * New with GL_EXT_timer_query */ void GLAPIENTRY -_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params) +_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params) { struct gl_query_object *q = NULL; GET_CURRENT_CONTEXT(ctx); @@ -740,20 +740,20 @@ void _mesa_init_queryobj_dispatch(const struct gl_context *ctx, struct _glapi_table *disp) { - SET_GenQueriesARB(disp, _mesa_GenQueriesARB); - SET_DeleteQueriesARB(disp, _mesa_DeleteQueriesARB); - SET_IsQueryARB(disp, _mesa_IsQueryARB); - SET_BeginQueryARB(disp, _mesa_BeginQueryARB); - SET_EndQueryARB(disp, _mesa_EndQueryARB); - SET_GetQueryivARB(disp, _mesa_GetQueryivARB); - SET_GetQueryObjectuivARB(disp, _mesa_GetQueryObjectuivARB); + SET_GenQueries(disp, _mesa_GenQueries); + SET_DeleteQueries(disp, _mesa_DeleteQueries); + SET_IsQuery(disp, _mesa_IsQuery); + SET_BeginQuery(disp, _mesa_BeginQuery); + SET_EndQuery(disp, _mesa_EndQuery); + SET_GetQueryiv(disp, _mesa_GetQueryiv); + SET_GetQueryObjectuiv(disp, _mesa_GetQueryObjectuiv); if (_mesa_is_desktop_gl(ctx)) { - SET_GetQueryObjectivARB(disp, _mesa_GetQueryObjectivARB); + SET_GetQueryObjectiv(disp, _mesa_GetQueryObjectiv); SET_QueryCounter(disp, _mesa_QueryCounter); - SET_GetQueryObjecti64vEXT(disp, _mesa_GetQueryObjecti64vEXT); - SET_GetQueryObjectui64vEXT(disp, _mesa_GetQueryObjectui64vEXT); + SET_GetQueryObjecti64v(disp, _mesa_GetQueryObjecti64v); + SET_GetQueryObjectui64v(disp, _mesa_GetQueryObjectui64v); SET_BeginQueryIndexed(disp, _mesa_BeginQueryIndexed); SET_EndQueryIndexed(disp, _mesa_EndQueryIndexed); diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h index f9e916cda89..78cbfc29455 100644 --- a/src/mesa/main/queryobj.h +++ b/src/mesa/main/queryobj.h @@ -54,33 +54,33 @@ extern void _mesa_free_queryobj_data(struct gl_context *ctx); void GLAPIENTRY -_mesa_GenQueriesARB(GLsizei n, GLuint *ids); +_mesa_GenQueries(GLsizei n, GLuint *ids); void GLAPIENTRY -_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids); +_mesa_DeleteQueries(GLsizei n, const GLuint *ids); GLboolean GLAPIENTRY -_mesa_IsQueryARB(GLuint id); +_mesa_IsQuery(GLuint id); void GLAPIENTRY _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id); void GLAPIENTRY _mesa_EndQueryIndexed(GLenum target, GLuint index); void GLAPIENTRY -_mesa_BeginQueryARB(GLenum target, GLuint id); +_mesa_BeginQuery(GLenum target, GLuint id); void GLAPIENTRY -_mesa_EndQueryARB(GLenum target); +_mesa_EndQuery(GLenum target); void GLAPIENTRY _mesa_QueryCounter(GLuint id, GLenum target); void GLAPIENTRY _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params); void GLAPIENTRY -_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params); +_mesa_GetQueryiv(GLenum target, GLenum pname, GLint *params); void GLAPIENTRY -_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params); +_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params); void GLAPIENTRY -_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params); +_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params); void GLAPIENTRY -_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params); +_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params); void GLAPIENTRY -_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params); +_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params); #endif /* QUERYOBJ_H */ diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index 0ea95b59407..51747acabcc 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -289,49 +289,49 @@ window_pos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) void GLAPIENTRY -_mesa_WindowPos2dMESA(GLdouble x, GLdouble y) +_mesa_WindowPos2d(GLdouble x, GLdouble y) { window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos2fMESA(GLfloat x, GLfloat y) +_mesa_WindowPos2f(GLfloat x, GLfloat y) { window_pos4f(x, y, 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos2iMESA(GLint x, GLint y) +_mesa_WindowPos2i(GLint x, GLint y) { window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos2sMESA(GLshort x, GLshort y) +_mesa_WindowPos2s(GLshort x, GLshort y) { window_pos4f(x, y, 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z) +_mesa_WindowPos3d(GLdouble x, GLdouble y, GLdouble z) { window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } void GLAPIENTRY -_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z) +_mesa_WindowPos3f(GLfloat x, GLfloat y, GLfloat z) { window_pos4f(x, y, z, 1.0F); } void GLAPIENTRY -_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z) +_mesa_WindowPos3i(GLint x, GLint y, GLint z) { window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } void GLAPIENTRY -_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z) +_mesa_WindowPos3s(GLshort x, GLshort y, GLshort z) { window_pos4f(x, y, z, 1.0F); } @@ -361,49 +361,49 @@ _mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w) } void GLAPIENTRY -_mesa_WindowPos2dvMESA(const GLdouble *v) +_mesa_WindowPos2dv(const GLdouble *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos2fvMESA(const GLfloat *v) +_mesa_WindowPos2fv(const GLfloat *v) { window_pos4f(v[0], v[1], 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos2ivMESA(const GLint *v) +_mesa_WindowPos2iv(const GLint *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos2svMESA(const GLshort *v) +_mesa_WindowPos2sv(const GLshort *v) { window_pos4f(v[0], v[1], 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos3dvMESA(const GLdouble *v) +_mesa_WindowPos3dv(const GLdouble *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } void GLAPIENTRY -_mesa_WindowPos3fvMESA(const GLfloat *v) +_mesa_WindowPos3fv(const GLfloat *v) { window_pos4f(v[0], v[1], v[2], 1.0); } void GLAPIENTRY -_mesa_WindowPos3ivMESA(const GLint *v) +_mesa_WindowPos3iv(const GLint *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } void GLAPIENTRY -_mesa_WindowPos3svMESA(const GLshort *v) +_mesa_WindowPos3sv(const GLshort *v) { window_pos4f(v[0], v[1], v[2], 1.0F); } diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h index 90351e86bee..bbd32abd383 100644 --- a/src/mesa/main/rastpos.h +++ b/src/mesa/main/rastpos.h @@ -90,21 +90,21 @@ _mesa_RasterPos4iv(const GLint *v); void GLAPIENTRY _mesa_RasterPos4sv(const GLshort *v); void GLAPIENTRY -_mesa_WindowPos2dMESA(GLdouble x, GLdouble y); +_mesa_WindowPos2d(GLdouble x, GLdouble y); void GLAPIENTRY -_mesa_WindowPos2fMESA(GLfloat x, GLfloat y); +_mesa_WindowPos2f(GLfloat x, GLfloat y); void GLAPIENTRY -_mesa_WindowPos2iMESA(GLint x, GLint y); +_mesa_WindowPos2i(GLint x, GLint y); void GLAPIENTRY -_mesa_WindowPos2sMESA(GLshort x, GLshort y); +_mesa_WindowPos2s(GLshort x, GLshort y); void GLAPIENTRY -_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z); +_mesa_WindowPos3d(GLdouble x, GLdouble y, GLdouble z); void GLAPIENTRY -_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z); +_mesa_WindowPos3f(GLfloat x, GLfloat y, GLfloat z); void GLAPIENTRY -_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z); +_mesa_WindowPos3i(GLint x, GLint y, GLint z); void GLAPIENTRY -_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z); +_mesa_WindowPos3s(GLshort x, GLshort y, GLshort z); void GLAPIENTRY _mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w); void GLAPIENTRY @@ -114,21 +114,21 @@ _mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w); void GLAPIENTRY _mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w); void GLAPIENTRY -_mesa_WindowPos2dvMESA(const GLdouble *v); +_mesa_WindowPos2dv(const GLdouble *v); void GLAPIENTRY -_mesa_WindowPos2fvMESA(const GLfloat *v); +_mesa_WindowPos2fv(const GLfloat *v); void GLAPIENTRY -_mesa_WindowPos2ivMESA(const GLint *v); +_mesa_WindowPos2iv(const GLint *v); void GLAPIENTRY -_mesa_WindowPos2svMESA(const GLshort *v); +_mesa_WindowPos2sv(const GLshort *v); void GLAPIENTRY -_mesa_WindowPos3dvMESA(const GLdouble *v); +_mesa_WindowPos3dv(const GLdouble *v); void GLAPIENTRY -_mesa_WindowPos3fvMESA(const GLfloat *v); +_mesa_WindowPos3fv(const GLfloat *v); void GLAPIENTRY -_mesa_WindowPos3ivMESA(const GLint *v); +_mesa_WindowPos3iv(const GLint *v); void GLAPIENTRY -_mesa_WindowPos3svMESA(const GLshort *v); +_mesa_WindowPos3sv(const GLshort *v); void GLAPIENTRY _mesa_WindowPos4dvMESA(const GLdouble *v); void GLAPIENTRY diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index 02a48ba60a6..27b1b8f5688 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -40,7 +40,7 @@ extern "C" { } void GLAPIENTRY -_mesa_BindAttribLocationARB(GLhandleARB program, GLuint index, +_mesa_BindAttribLocation(GLhandleARB program, GLuint index, const GLcharARB *name) { GET_CURRENT_CONTEXT(ctx); @@ -77,7 +77,7 @@ _mesa_BindAttribLocationARB(GLhandleARB program, GLuint index, } void GLAPIENTRY -_mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index, +_mesa_GetActiveAttrib(GLhandleARB program, GLuint desired_index, GLsizei maxLength, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name) { @@ -132,7 +132,7 @@ _mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index, } GLint GLAPIENTRY -_mesa_GetAttribLocationARB(GLhandleARB program, const GLcharARB * name) +_mesa_GetAttribLocation(GLhandleARB program, const GLcharARB * name) { GET_CURRENT_CONTEXT(ctx); struct gl_shader_program *const shProg = diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 9376b0f42ef..2d93e90a2a1 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -1001,7 +1001,7 @@ _mesa_AttachShader(GLuint program, GLuint shader) void GLAPIENTRY -_mesa_CompileShaderARB(GLhandleARB shaderObj) +_mesa_CompileShader(GLhandleARB shaderObj) { GET_CURRENT_CONTEXT(ctx); if (MESA_VERBOSE & VERBOSE_API) @@ -1215,7 +1215,7 @@ _mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize, void GLAPIENTRY -_mesa_GetShaderSourceARB(GLhandleARB shader, GLsizei maxLength, +_mesa_GetShaderSource(GLhandleARB shader, GLsizei maxLength, GLsizei *length, GLcharARB *sourceOut) { GET_CURRENT_CONTEXT(ctx); @@ -1248,7 +1248,7 @@ _mesa_IsShader(GLuint name) void GLAPIENTRY -_mesa_LinkProgramARB(GLhandleARB programObj) +_mesa_LinkProgram(GLhandleARB programObj) { GET_CURRENT_CONTEXT(ctx); link_program(ctx, programObj); @@ -1291,7 +1291,7 @@ read_shader(const char *fname) * and pass it to _mesa_shader_source(). */ void GLAPIENTRY -_mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count, +_mesa_ShaderSource(GLhandleARB shaderObj, GLsizei count, const GLcharARB ** string, const GLint * length) { GET_CURRENT_CONTEXT(ctx); @@ -1385,7 +1385,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count, void GLAPIENTRY -_mesa_UseProgramObjectARB(GLhandleARB program) +_mesa_UseProgram(GLhandleARB program) { GET_CURRENT_CONTEXT(ctx); struct gl_shader_program *shProg; @@ -1425,7 +1425,7 @@ _mesa_UseProgramObjectARB(GLhandleARB program) void GLAPIENTRY -_mesa_ValidateProgramARB(GLhandleARB program) +_mesa_ValidateProgram(GLhandleARB program) { GET_CURRENT_CONTEXT(ctx); validate_program(ctx, program); @@ -1706,12 +1706,12 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx, } if (ctx->API != API_OPENGLES) { - SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB); - SET_CompileShaderARB(exec, _mesa_CompileShaderARB); - SET_LinkProgramARB(exec, _mesa_LinkProgramARB); - SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB); - SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB); - SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB); + SET_ShaderSource(exec, _mesa_ShaderSource); + SET_CompileShader(exec, _mesa_CompileShader); + SET_LinkProgram(exec, _mesa_LinkProgram); + SET_UseProgram(exec, _mesa_UseProgram); + SET_ValidateProgram(exec, _mesa_ValidateProgram); + SET_GetShaderSource(exec, _mesa_GetShaderSource); /* OpenGL 2.0 */ SET_AttachShader(exec, _mesa_AttachShader); @@ -1729,9 +1729,9 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx, SET_IsShader(exec, _mesa_IsShader); /* GL_ARB_vertex_shader */ - SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB); - SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB); - SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB); + SET_BindAttribLocation(exec, _mesa_BindAttribLocation); + SET_GetActiveAttrib(exec, _mesa_GetActiveAttrib); + SET_GetAttribLocation(exec, _mesa_GetAttribLocation); } if (ctx->API == API_OPENGL) { @@ -1742,10 +1742,10 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx, /* GL_EXT_gpu_shader4 / GL 3.0 */ if (_mesa_is_desktop_gl(ctx)) { - SET_BindFragDataLocationEXT(exec, _mesa_BindFragDataLocation); + SET_BindFragDataLocation(exec, _mesa_BindFragDataLocation); } if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_GetFragDataLocationEXT(exec, _mesa_GetFragDataLocation); + SET_GetFragDataLocation(exec, _mesa_GetFragDataLocation); } /* GL_ARB_ES2_compatibility */ diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index d6382e04a76..64798bc2e23 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -64,7 +64,7 @@ extern void GLAPIENTRY _mesa_AttachObjectARB(GLhandleARB, GLhandleARB); extern void GLAPIENTRY -_mesa_CompileShaderARB(GLhandleARB); +_mesa_CompileShader(GLhandleARB); extern GLhandleARB GLAPIENTRY _mesa_CreateProgramObjectARB(void); @@ -100,7 +100,7 @@ extern void GLAPIENTRY _mesa_GetObjectParameterivARB(GLhandleARB, GLenum, GLint *); extern void GLAPIENTRY -_mesa_GetShaderSourceARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *); +_mesa_GetShaderSource(GLhandleARB, GLsizei, GLsizei *, GLcharARB *); extern GLboolean GLAPIENTRY _mesa_IsProgram(GLuint name); @@ -109,20 +109,20 @@ extern GLboolean GLAPIENTRY _mesa_IsShader(GLuint name); extern void GLAPIENTRY -_mesa_LinkProgramARB(GLhandleARB programObj); +_mesa_LinkProgram(GLhandleARB programObj); extern void GLAPIENTRY -_mesa_ShaderSourceARB(GLhandleARB, GLsizei, const GLcharARB* *, const GLint *); +_mesa_ShaderSource(GLhandleARB, GLsizei, const GLcharARB* *, const GLint *); extern void GLAPIENTRY -_mesa_UseProgramObjectARB(GLhandleARB); +_mesa_UseProgram(GLhandleARB); extern void GLAPIENTRY -_mesa_ValidateProgramARB(GLhandleARB); +_mesa_ValidateProgram(GLhandleARB); extern void GLAPIENTRY -_mesa_BindAttribLocationARB(GLhandleARB, GLuint, const GLcharARB *); +_mesa_BindAttribLocation(GLhandleARB, GLuint, const GLcharARB *); extern void GLAPIENTRY _mesa_BindFragDataLocation(GLuint program, GLuint colorNumber, @@ -133,11 +133,11 @@ _mesa_BindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name); extern void GLAPIENTRY -_mesa_GetActiveAttribARB(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, +_mesa_GetActiveAttrib(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); extern GLint GLAPIENTRY -_mesa_GetAttribLocationARB(GLhandleARB, const GLcharARB *); +_mesa_GetAttribLocation(GLhandleARB, const GLcharARB *); diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index b0475da1a5b..56f0dfb921c 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -894,7 +894,7 @@ const struct function gl_core_functions_possible[] = { }; const struct function gles11_functions_possible[] = { - { "glActiveTexture", 11, _gloffset_ActiveTextureARB }, + { "glActiveTexture", 11, _gloffset_ActiveTexture }, { "glAlphaFunc", 11, _gloffset_AlphaFunc }, { "glAlphaFuncx", 11, -1 }, { "glBindBuffer", 11, -1 }, @@ -914,7 +914,7 @@ const struct function gles11_functions_possible[] = { { "glClearDepthf", 11, -1 }, { "glClearDepthx", 11, -1 }, { "glClearStencil", 11, _gloffset_ClearStencil }, - { "glClientActiveTexture", 11, _gloffset_ClientActiveTextureARB }, + { "glClientActiveTexture", 11, _gloffset_ClientActiveTexture }, { "glClipPlanef", 11, -1 }, { "glClipPlanex", 11, -1 }, { "glColor4f", 11, _gloffset_Color4f }, @@ -1088,7 +1088,7 @@ const struct function gles11_functions_possible[] = { }; const struct function gles2_functions_possible[] = { - { "glActiveTexture", 20, _gloffset_ActiveTextureARB }, + { "glActiveTexture", 20, _gloffset_ActiveTexture }, { "glAttachShader", 20, -1 }, { "glBindAttribLocation", 20, -1 }, { "glBindBuffer", 20, -1 }, diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index 554c68b7186..2ccdcebd9f9 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -959,7 +959,7 @@ _mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize, } void GLAPIENTRY -_mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img) +_mesa_GetCompressedTexImage(GLenum target, GLint level, GLvoid *img) { _mesa_GetnCompressedTexImageARB(target, level, INT_MAX, img); } diff --git a/src/mesa/main/texgetimage.h b/src/mesa/main/texgetimage.h index cd8e76e7a3e..c9277fc91b7 100644 --- a/src/mesa/main/texgetimage.h +++ b/src/mesa/main/texgetimage.h @@ -54,7 +54,7 @@ _mesa_GetnTexImageARB( GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *pixels ); extern void GLAPIENTRY -_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img); +_mesa_GetCompressedTexImage(GLenum target, GLint lod, GLvoid *img); extern void GLAPIENTRY _mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize, diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 0f28009b0cd..678833ec5ee 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -3532,7 +3532,7 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims, void GLAPIENTRY -_mesa_CompressedTexImage1DARB(GLenum target, GLint level, +_mesa_CompressedTexImage1D(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data) @@ -3544,7 +3544,7 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level, void GLAPIENTRY -_mesa_CompressedTexImage2DARB(GLenum target, GLint level, +_mesa_CompressedTexImage2D(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data) @@ -3556,7 +3556,7 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level, void GLAPIENTRY -_mesa_CompressedTexImage3DARB(GLenum target, GLint level, +_mesa_CompressedTexImage3D(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data) @@ -3611,7 +3611,7 @@ compressed_tex_sub_image(GLuint dims, GLenum target, GLint level, void GLAPIENTRY -_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset, +_mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data) { @@ -3621,7 +3621,7 @@ _mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset, void GLAPIENTRY -_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset, +_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data) @@ -3632,7 +3632,7 @@ _mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset, void GLAPIENTRY -_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset, +_mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data) diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h index e1b15d2520d..ca4b8c86632 100644 --- a/src/mesa/main/teximage.h +++ b/src/mesa/main/teximage.h @@ -248,41 +248,41 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level, extern void GLAPIENTRY -_mesa_CompressedTexImage1DARB(GLenum target, GLint level, +_mesa_CompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); extern void GLAPIENTRY -_mesa_CompressedTexImage2DARB(GLenum target, GLint level, +_mesa_CompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); extern void GLAPIENTRY -_mesa_CompressedTexImage3DARB(GLenum target, GLint level, +_mesa_CompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); #ifdef VMS -#define _mesa_CompressedTexSubImage1DARB _mesa_CompressedTexSubImage1DAR -#define _mesa_CompressedTexSubImage2DARB _mesa_CompressedTexSubImage2DAR -#define _mesa_CompressedTexSubImage3DARB _mesa_CompressedTexSubImage3DAR +#define _mesa_CompressedTexSubImage1D _mesa_CompressedTexSubImage1DAR +#define _mesa_CompressedTexSubImage2D _mesa_CompressedTexSubImage2DAR +#define _mesa_CompressedTexSubImage3D _mesa_CompressedTexSubImage3DAR #endif extern void GLAPIENTRY -_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset, +_mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); extern void GLAPIENTRY -_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset, +_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); extern void GLAPIENTRY -_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset, +_mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 1f765086b6d..8e9bbf6a180 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -286,7 +286,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state, /* GL_ARB_multitexture */ void GLAPIENTRY -_mesa_ActiveTextureARB(GLenum texture) +_mesa_ActiveTexture(GLenum texture) { const GLuint texUnit = texture - GL_TEXTURE0; GLuint k; @@ -325,7 +325,7 @@ _mesa_ActiveTextureARB(GLenum texture) /* GL_ARB_multitexture */ void GLAPIENTRY -_mesa_ClientActiveTextureARB(GLenum texture) +_mesa_ClientActiveTexture(GLenum texture) { GET_CURRENT_CONTEXT(ctx); GLuint texUnit = texture - GL_TEXTURE0; diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h index 7dc6dc6a2cd..7abf9101ebf 100644 --- a/src/mesa/main/texstate.h +++ b/src/mesa/main/texstate.h @@ -62,10 +62,10 @@ _mesa_print_texunit_state( struct gl_context *ctx, GLuint unit ); /*@{*/ extern void GLAPIENTRY -_mesa_ActiveTextureARB( GLenum target ); +_mesa_ActiveTexture( GLenum target ); extern void GLAPIENTRY -_mesa_ClientActiveTextureARB( GLenum target ); +_mesa_ClientActiveTexture( GLenum target ); /*@}*/ diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index bddb8f95e14..c71577c6ed1 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -38,7 +38,7 @@ extern "C" void GLAPIENTRY -_mesa_GetActiveUniformARB(GLhandleARB program, GLuint index, +_mesa_GetActiveUniform(GLhandleARB program, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *nameOut) { diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 2b7a564f0c5..3f156bf103f 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -128,14 +128,14 @@ _mesa_uniform_detach_all_driver_storage(struct gl_uniform_storage *uni) } void GLAPIENTRY -_mesa_Uniform1fARB(GLint location, GLfloat v0) +_mesa_Uniform1f(GLint location, GLfloat v0) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_FLOAT); } void GLAPIENTRY -_mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1) +_mesa_Uniform2f(GLint location, GLfloat v0, GLfloat v1) { GET_CURRENT_CONTEXT(ctx); GLfloat v[2]; @@ -145,7 +145,7 @@ _mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1) } void GLAPIENTRY -_mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) +_mesa_Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) { GET_CURRENT_CONTEXT(ctx); GLfloat v[3]; @@ -156,7 +156,7 @@ _mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) } void GLAPIENTRY -_mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, +_mesa_Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3) { GET_CURRENT_CONTEXT(ctx); @@ -169,14 +169,14 @@ _mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, } void GLAPIENTRY -_mesa_Uniform1iARB(GLint location, GLint v0) +_mesa_Uniform1i(GLint location, GLint v0) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_INT); } void GLAPIENTRY -_mesa_Uniform2iARB(GLint location, GLint v0, GLint v1) +_mesa_Uniform2i(GLint location, GLint v0, GLint v1) { GET_CURRENT_CONTEXT(ctx); GLint v[2]; @@ -186,7 +186,7 @@ _mesa_Uniform2iARB(GLint location, GLint v0, GLint v1) } void GLAPIENTRY -_mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2) +_mesa_Uniform3i(GLint location, GLint v0, GLint v1, GLint v2) { GET_CURRENT_CONTEXT(ctx); GLint v[3]; @@ -197,7 +197,7 @@ _mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2) } void GLAPIENTRY -_mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3) +_mesa_Uniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3) { GET_CURRENT_CONTEXT(ctx); GLint v[4]; @@ -209,56 +209,56 @@ _mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3) } void GLAPIENTRY -_mesa_Uniform1fvARB(GLint location, GLsizei count, const GLfloat * value) +_mesa_Uniform1fv(GLint location, GLsizei count, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT); } void GLAPIENTRY -_mesa_Uniform2fvARB(GLint location, GLsizei count, const GLfloat * value) +_mesa_Uniform2fv(GLint location, GLsizei count, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC2); } void GLAPIENTRY -_mesa_Uniform3fvARB(GLint location, GLsizei count, const GLfloat * value) +_mesa_Uniform3fv(GLint location, GLsizei count, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC3); } void GLAPIENTRY -_mesa_Uniform4fvARB(GLint location, GLsizei count, const GLfloat * value) +_mesa_Uniform4fv(GLint location, GLsizei count, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC4); } void GLAPIENTRY -_mesa_Uniform1ivARB(GLint location, GLsizei count, const GLint * value) +_mesa_Uniform1iv(GLint location, GLsizei count, const GLint * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT); } void GLAPIENTRY -_mesa_Uniform2ivARB(GLint location, GLsizei count, const GLint * value) +_mesa_Uniform2iv(GLint location, GLsizei count, const GLint * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC2); } void GLAPIENTRY -_mesa_Uniform3ivARB(GLint location, GLsizei count, const GLint * value) +_mesa_Uniform3iv(GLint location, GLsizei count, const GLint * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC3); } void GLAPIENTRY -_mesa_Uniform4ivARB(GLint location, GLsizei count, const GLint * value) +_mesa_Uniform4iv(GLint location, GLsizei count, const GLint * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC4); @@ -337,7 +337,7 @@ _mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value) void GLAPIENTRY -_mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose, +_mesa_UniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); @@ -346,7 +346,7 @@ _mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose, } void GLAPIENTRY -_mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose, +_mesa_UniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); @@ -355,7 +355,7 @@ _mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose, } void GLAPIENTRY -_mesa_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose, +_mesa_UniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); @@ -431,7 +431,7 @@ _mesa_GetnUniformfvARB(GLhandleARB program, GLint location, } void GLAPIENTRY -_mesa_GetUniformfvARB(GLhandleARB program, GLint location, GLfloat *params) +_mesa_GetUniformfv(GLhandleARB program, GLint location, GLfloat *params) { _mesa_GetnUniformfvARB(program, location, INT_MAX, params); } @@ -446,7 +446,7 @@ _mesa_GetnUniformivARB(GLhandleARB program, GLint location, } void GLAPIENTRY -_mesa_GetUniformivARB(GLhandleARB program, GLint location, GLint *params) +_mesa_GetUniformiv(GLhandleARB program, GLint location, GLint *params) { _mesa_GetnUniformivARB(program, location, INT_MAX, params); } @@ -495,7 +495,7 @@ _mesa_GetUniformdv(GLhandleARB program, GLint location, GLdouble *params) GLint GLAPIENTRY -_mesa_GetUniformLocationARB(GLhandleARB programObj, const GLcharARB *name) +_mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name) { struct gl_shader_program *shProg; GLuint index, offset; diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 076bde3c85e..287d7106bb6 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -39,37 +39,37 @@ struct gl_program; struct _glapi_table; void GLAPIENTRY -_mesa_Uniform1fARB(GLint, GLfloat); +_mesa_Uniform1f(GLint, GLfloat); void GLAPIENTRY -_mesa_Uniform2fARB(GLint, GLfloat, GLfloat); +_mesa_Uniform2f(GLint, GLfloat, GLfloat); void GLAPIENTRY -_mesa_Uniform3fARB(GLint, GLfloat, GLfloat, GLfloat); +_mesa_Uniform3f(GLint, GLfloat, GLfloat, GLfloat); void GLAPIENTRY -_mesa_Uniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat); +_mesa_Uniform4f(GLint, GLfloat, GLfloat, GLfloat, GLfloat); void GLAPIENTRY -_mesa_Uniform1iARB(GLint, GLint); +_mesa_Uniform1i(GLint, GLint); void GLAPIENTRY -_mesa_Uniform2iARB(GLint, GLint, GLint); +_mesa_Uniform2i(GLint, GLint, GLint); void GLAPIENTRY -_mesa_Uniform3iARB(GLint, GLint, GLint, GLint); +_mesa_Uniform3i(GLint, GLint, GLint, GLint); void GLAPIENTRY -_mesa_Uniform4iARB(GLint, GLint, GLint, GLint, GLint); +_mesa_Uniform4i(GLint, GLint, GLint, GLint, GLint); void GLAPIENTRY -_mesa_Uniform1fvARB(GLint, GLsizei, const GLfloat *); +_mesa_Uniform1fv(GLint, GLsizei, const GLfloat *); void GLAPIENTRY -_mesa_Uniform2fvARB(GLint, GLsizei, const GLfloat *); +_mesa_Uniform2fv(GLint, GLsizei, const GLfloat *); void GLAPIENTRY -_mesa_Uniform3fvARB(GLint, GLsizei, const GLfloat *); +_mesa_Uniform3fv(GLint, GLsizei, const GLfloat *); void GLAPIENTRY -_mesa_Uniform4fvARB(GLint, GLsizei, const GLfloat *); +_mesa_Uniform4fv(GLint, GLsizei, const GLfloat *); void GLAPIENTRY -_mesa_Uniform1ivARB(GLint, GLsizei, const GLint *); +_mesa_Uniform1iv(GLint, GLsizei, const GLint *); void GLAPIENTRY -_mesa_Uniform2ivARB(GLint, GLsizei, const GLint *); +_mesa_Uniform2iv(GLint, GLsizei, const GLint *); void GLAPIENTRY -_mesa_Uniform3ivARB(GLint, GLsizei, const GLint *); +_mesa_Uniform3iv(GLint, GLsizei, const GLint *); void GLAPIENTRY -_mesa_Uniform4ivARB(GLint, GLsizei, const GLint *); +_mesa_Uniform4iv(GLint, GLsizei, const GLint *); void GLAPIENTRY _mesa_Uniform1ui(GLint location, GLuint v0); void GLAPIENTRY @@ -87,11 +87,11 @@ _mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value); void GLAPIENTRY _mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value); void GLAPIENTRY -_mesa_UniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *); +_mesa_UniformMatrix2fv(GLint, GLsizei, GLboolean, const GLfloat *); void GLAPIENTRY -_mesa_UniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *); +_mesa_UniformMatrix3fv(GLint, GLsizei, GLboolean, const GLfloat *); void GLAPIENTRY -_mesa_UniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *); +_mesa_UniformMatrix4fv(GLint, GLsizei, GLboolean, const GLfloat *); void GLAPIENTRY _mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); @@ -113,7 +113,7 @@ _mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, void GLAPIENTRY _mesa_GetnUniformfvARB(GLhandleARB, GLint, GLsizei, GLfloat *); void GLAPIENTRY -_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *); +_mesa_GetUniformfv(GLhandleARB, GLint, GLfloat *); void GLAPIENTRY _mesa_GetnUniformivARB(GLhandleARB, GLint, GLsizei, GLint *); void GLAPIENTRY @@ -127,7 +127,7 @@ _mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *); void GLAPIENTRY _mesa_GetUniformdv(GLhandleARB, GLint, GLdouble *); GLint GLAPIENTRY -_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *); +_mesa_GetUniformLocation(GLhandleARB, const GLcharARB *); GLuint GLAPIENTRY _mesa_GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName); @@ -156,7 +156,7 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName); void GLAPIENTRY -_mesa_GetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *, +_mesa_GetActiveUniform(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); void GLAPIENTRY _mesa_GetActiveUniformsiv(GLuint program, @@ -165,7 +165,7 @@ _mesa_GetActiveUniformsiv(GLuint program, GLenum pname, GLint *params); void GLAPIENTRY -_mesa_GetUniformivARB(GLhandleARB, GLint, GLint *); +_mesa_GetUniformiv(GLhandleARB, GLint, GLint *); unsigned _mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg, diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index 3974787b4fa..7a5a5c5debc 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -330,7 +330,7 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr) void GLAPIENTRY -_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr) +_mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr) { const GLbitfield legalTypes = (HALF_BIT | FLOAT_BIT | DOUBLE_BIT); GET_CURRENT_CONTEXT(ctx); @@ -357,7 +357,7 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr) void GLAPIENTRY -_mesa_SecondaryColorPointerEXT(GLint size, GLenum type, +_mesa_SecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr) { const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT | @@ -413,7 +413,7 @@ _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr) void GLAPIENTRY -_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr) +_mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr) { const GLbitfield legalTypes = (FLOAT_BIT | FIXED_ES_BIT); GET_CURRENT_CONTEXT(ctx); @@ -437,7 +437,7 @@ _mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr) * (position, normal, color, fog, texcoord, etc). */ void GLAPIENTRY -_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type, +_mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *ptr) { @@ -493,7 +493,7 @@ _mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type, void GLAPIENTRY -_mesa_EnableVertexAttribArrayARB(GLuint index) +_mesa_EnableVertexAttribArray(GLuint index) { struct gl_array_object *arrayObj; GET_CURRENT_CONTEXT(ctx); @@ -520,7 +520,7 @@ _mesa_EnableVertexAttribArrayARB(GLuint index) void GLAPIENTRY -_mesa_DisableVertexAttribArrayARB(GLuint index) +_mesa_DisableVertexAttribArray(GLuint index) { struct gl_array_object *arrayObj; GET_CURRENT_CONTEXT(ctx); @@ -630,7 +630,7 @@ get_current_attrib(struct gl_context *ctx, GLuint index, const char *function) } void GLAPIENTRY -_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params) +_mesa_GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -649,7 +649,7 @@ _mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params) void GLAPIENTRY -_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params) +_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -671,7 +671,7 @@ _mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params) void GLAPIENTRY -_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params) +_mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -736,7 +736,7 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params) void GLAPIENTRY -_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer) +_mesa_GetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -1039,7 +1039,7 @@ _mesa_UnlockArraysEXT( void ) /* GL_EXT_multi_draw_arrays */ void GLAPIENTRY -_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first, +_mesa_MultiDrawArrays( GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount ) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index b54e2f7df82..904fa1bea8f 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -127,20 +127,20 @@ _mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr); extern void GLAPIENTRY -_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr); +_mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr); extern void GLAPIENTRY -_mesa_SecondaryColorPointerEXT(GLint size, GLenum type, +_mesa_SecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr); extern void GLAPIENTRY -_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr); +_mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr); extern void GLAPIENTRY -_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type, +_mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); @@ -150,23 +150,23 @@ _mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type, extern void GLAPIENTRY -_mesa_EnableVertexAttribArrayARB(GLuint index); +_mesa_EnableVertexAttribArray(GLuint index); extern void GLAPIENTRY -_mesa_DisableVertexAttribArrayARB(GLuint index); +_mesa_DisableVertexAttribArray(GLuint index); extern void GLAPIENTRY -_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params); +_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params); extern void GLAPIENTRY -_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params); +_mesa_GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params); extern void GLAPIENTRY -_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params); +_mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params); extern void GLAPIENTRY @@ -178,7 +178,7 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params); extern void GLAPIENTRY -_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer); +_mesa_GetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer); extern void GLAPIENTRY @@ -186,7 +186,7 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer); extern void GLAPIENTRY -_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first, +_mesa_MultiDrawArrays( GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount ); extern void GLAPIENTRY |