Mercurial > mplayer.hg

changeset 29941:092c1689c9df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prefer GLAPIENTRY over APIENTRY, it is the better name and used more by OpenGL headers.
author reimar
date Wed, 09 Dec 2009 17:36:55 +0000
parents 25834f2645d0
children 9b90e1052b32
files libvo/gl_common.c libvo/gl_common.h
diffstat 2 files changed, 142 insertions(+), 142 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/gl_common.c	Tue Dec 08 23:58:42 2009 +0000
+++ b/libvo/gl_common.c	Wed Dec 09 17:36:55 2009 +0000
@@ -35,46 +35,46 @@
 #include "gl_common.h"
 #include "libavutil/common.h"
 
-void (APIENTRY *Begin)(GLenum) = glBegin;
-void (APIENTRY *End)(void) = glEnd;
-void (APIENTRY *Viewport)(GLint, GLint, GLsizei, GLsizei) = glViewport;
-void (APIENTRY *MatrixMode)(GLenum) = glMatrixMode;
-void (APIENTRY *LoadIdentity)(void) = glLoadIdentity;
-void (APIENTRY *Scaled)(double, double, double) = glScaled;
-void (APIENTRY *Ortho)(double, double, double, double, double, double) = glOrtho;
-void (APIENTRY *PushMatrix)(void) = glPushMatrix;
-void (APIENTRY *PopMatrix)(void) = glPopMatrix;
-void (APIENTRY *Clear)(GLbitfield) = glClear;
-GLuint (APIENTRY *GenLists)(GLsizei) = glGenLists;
-void (APIENTRY *DeleteLists)(GLuint, GLsizei) = glDeleteLists;
-void (APIENTRY *NewList)(GLuint, GLenum) = glNewList;
-void (APIENTRY *EndList)(void) = glEndList;
-void (APIENTRY *CallList)(GLuint) = glCallList;
-void (APIENTRY *CallLists)(GLsizei, GLenum, const GLvoid *) = glCallLists;
-void (APIENTRY *GenTextures)(GLsizei, GLuint *) = glGenTextures;
-void (APIENTRY *DeleteTextures)(GLsizei, const GLuint *) = glDeleteTextures;
-void (APIENTRY *TexEnvi)(GLenum, GLenum, GLint) = glTexEnvi;
-void (APIENTRY *Color4ub)(GLubyte, GLubyte, GLubyte, GLubyte) = glColor4ub;
-void (APIENTRY *Color3f)(GLfloat, GLfloat, GLfloat) = glColor3f;
-void (APIENTRY *ClearColor)(GLclampf, GLclampf, GLclampf, GLclampf) = glClearColor;
-void (APIENTRY *Enable)(GLenum) = glEnable;
-void (APIENTRY *Disable)(GLenum) = glDisable;
-const GLubyte *(APIENTRY *GetString)(GLenum) = glGetString;
-void (APIENTRY *DrawBuffer)(GLenum) = glDrawBuffer;
-void (APIENTRY *DepthMask)(GLboolean) = glDepthMask;
-void (APIENTRY *BlendFunc)(GLenum, GLenum) = glBlendFunc;
-void (APIENTRY *Flush)(void) = glFlush;
-void (APIENTRY *Finish)(void) = glFinish;
-void (APIENTRY *PixelStorei)(GLenum, GLint) = glPixelStorei;
-void (APIENTRY *TexImage1D)(GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *) = glTexImage1D;
-void (APIENTRY *TexImage2D)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *) = glTexImage2D;
-void (APIENTRY *TexSubImage2D)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *) = glTexSubImage2D;
-void (APIENTRY *TexParameteri)(GLenum, GLenum, GLint) = glTexParameteri;
-void (APIENTRY *TexParameterf)(GLenum, GLenum, GLfloat) = glTexParameterf;
-void (APIENTRY *TexParameterfv)(GLenum, GLenum, const GLfloat *) = glTexParameterfv;
-void (APIENTRY *TexCoord2f)(GLfloat, GLfloat) = glTexCoord2f;
-void (APIENTRY *Vertex2f)(GLfloat, GLfloat) = glVertex2f;
-void (APIENTRY *GetIntegerv)(GLenum, GLint *) = glGetIntegerv;
+void (GLAPIENTRY *Begin)(GLenum) = glBegin;
+void (GLAPIENTRY *End)(void) = glEnd;
+void (GLAPIENTRY *Viewport)(GLint, GLint, GLsizei, GLsizei) = glViewport;
+void (GLAPIENTRY *MatrixMode)(GLenum) = glMatrixMode;
+void (GLAPIENTRY *LoadIdentity)(void) = glLoadIdentity;
+void (GLAPIENTRY *Scaled)(double, double, double) = glScaled;
+void (GLAPIENTRY *Ortho)(double, double, double, double, double, double) = glOrtho;
+void (GLAPIENTRY *PushMatrix)(void) = glPushMatrix;
+void (GLAPIENTRY *PopMatrix)(void) = glPopMatrix;
+void (GLAPIENTRY *Clear)(GLbitfield) = glClear;
+GLuint (GLAPIENTRY *GenLists)(GLsizei) = glGenLists;
+void (GLAPIENTRY *DeleteLists)(GLuint, GLsizei) = glDeleteLists;
+void (GLAPIENTRY *NewList)(GLuint, GLenum) = glNewList;
+void (GLAPIENTRY *EndList)(void) = glEndList;
+void (GLAPIENTRY *CallList)(GLuint) = glCallList;
+void (GLAPIENTRY *CallLists)(GLsizei, GLenum, const GLvoid *) = glCallLists;
+void (GLAPIENTRY *GenTextures)(GLsizei, GLuint *) = glGenTextures;
+void (GLAPIENTRY *DeleteTextures)(GLsizei, const GLuint *) = glDeleteTextures;
+void (GLAPIENTRY *TexEnvi)(GLenum, GLenum, GLint) = glTexEnvi;
+void (GLAPIENTRY *Color4ub)(GLubyte, GLubyte, GLubyte, GLubyte) = glColor4ub;
+void (GLAPIENTRY *Color3f)(GLfloat, GLfloat, GLfloat) = glColor3f;
+void (GLAPIENTRY *ClearColor)(GLclampf, GLclampf, GLclampf, GLclampf) = glClearColor;
+void (GLAPIENTRY *Enable)(GLenum) = glEnable;
+void (GLAPIENTRY *Disable)(GLenum) = glDisable;
+const GLubyte *(GLAPIENTRY *GetString)(GLenum) = glGetString;
+void (GLAPIENTRY *DrawBuffer)(GLenum) = glDrawBuffer;
+void (GLAPIENTRY *DepthMask)(GLboolean) = glDepthMask;
+void (GLAPIENTRY *BlendFunc)(GLenum, GLenum) = glBlendFunc;
+void (GLAPIENTRY *Flush)(void) = glFlush;
+void (GLAPIENTRY *Finish)(void) = glFinish;
+void (GLAPIENTRY *PixelStorei)(GLenum, GLint) = glPixelStorei;
+void (GLAPIENTRY *TexImage1D)(GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *) = glTexImage1D;
+void (GLAPIENTRY *TexImage2D)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *) = glTexImage2D;
+void (GLAPIENTRY *TexSubImage2D)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *) = glTexSubImage2D;
+void (GLAPIENTRY *TexParameteri)(GLenum, GLenum, GLint) = glTexParameteri;
+void (GLAPIENTRY *TexParameterf)(GLenum, GLenum, GLfloat) = glTexParameterf;
+void (GLAPIENTRY *TexParameterfv)(GLenum, GLenum, const GLfloat *) = glTexParameterfv;
+void (GLAPIENTRY *TexCoord2f)(GLfloat, GLfloat) = glTexCoord2f;
+void (GLAPIENTRY *Vertex2f)(GLfloat, GLfloat) = glVertex2f;
+void (GLAPIENTRY *GetIntegerv)(GLenum, GLint *) = glGetIntegerv;
 
 /**
  * \defgroup glextfunctions OpenGL extension functions
@@ -83,43 +83,43 @@
  * context is created
  * \{
  */
-void (APIENTRY *GenBuffers)(GLsizei, GLuint *);
-void (APIENTRY *DeleteBuffers)(GLsizei, const GLuint *);
-void (APIENTRY *BindBuffer)(GLenum, GLuint);
-GLvoid* (APIENTRY *MapBuffer)(GLenum, GLenum);
-GLboolean (APIENTRY *UnmapBuffer)(GLenum);
-void (APIENTRY *BufferData)(GLenum, intptr_t, const GLvoid *, GLenum);
-void (APIENTRY *CombinerParameterfv)(GLenum, const GLfloat *);
-void (APIENTRY *CombinerParameteri)(GLenum, GLint);
-void (APIENTRY *CombinerInput)(GLenum, GLenum, GLenum, GLenum, GLenum,
+void (GLAPIENTRY *GenBuffers)(GLsizei, GLuint *);
+void (GLAPIENTRY *DeleteBuffers)(GLsizei, const GLuint *);
+void (GLAPIENTRY *BindBuffer)(GLenum, GLuint);
+GLvoid* (GLAPIENTRY *MapBuffer)(GLenum, GLenum);
+GLboolean (GLAPIENTRY *UnmapBuffer)(GLenum);
+void (GLAPIENTRY *BufferData)(GLenum, intptr_t, const GLvoid *, GLenum);
+void (GLAPIENTRY *CombinerParameterfv)(GLenum, const GLfloat *);
+void (GLAPIENTRY *CombinerParameteri)(GLenum, GLint);
+void (GLAPIENTRY *CombinerInput)(GLenum, GLenum, GLenum, GLenum, GLenum,
                                GLenum);
-void (APIENTRY *CombinerOutput)(GLenum, GLenum, GLenum, GLenum, GLenum,
+void (GLAPIENTRY *CombinerOutput)(GLenum, GLenum, GLenum, GLenum, GLenum,
                                 GLenum, GLenum, GLboolean, GLboolean,
                                 GLboolean);
-void (APIENTRY *BeginFragmentShader)(void);
-void (APIENTRY *EndFragmentShader)(void);
-void (APIENTRY *SampleMap)(GLuint, GLuint, GLenum);
-void (APIENTRY *ColorFragmentOp2)(GLenum, GLuint, GLuint, GLuint, GLuint,
+void (GLAPIENTRY *BeginFragmentShader)(void);
+void (GLAPIENTRY *EndFragmentShader)(void);
+void (GLAPIENTRY *SampleMap)(GLuint, GLuint, GLenum);
+void (GLAPIENTRY *ColorFragmentOp2)(GLenum, GLuint, GLuint, GLuint, GLuint,
                                   GLuint, GLuint, GLuint, GLuint, GLuint);
-void (APIENTRY *ColorFragmentOp3)(GLenum, GLuint, GLuint, GLuint, GLuint,
+void (GLAPIENTRY *ColorFragmentOp3)(GLenum, GLuint, GLuint, GLuint, GLuint,
                                   GLuint, GLuint, GLuint, GLuint, GLuint,
                                   GLuint, GLuint, GLuint);
-void (APIENTRY *SetFragmentShaderConstant)(GLuint, const GLfloat *);
-void (APIENTRY *ActiveTexture)(GLenum);
-void (APIENTRY *BindTexture)(GLenum, GLuint);
-void (APIENTRY *MultiTexCoord2f)(GLenum, GLfloat, GLfloat);
-void (APIENTRY *GenPrograms)(GLsizei, GLuint *);
-void (APIENTRY *DeletePrograms)(GLsizei, const GLuint *);
-void (APIENTRY *BindProgram)(GLenum, GLuint);
-void (APIENTRY *ProgramString)(GLenum, GLenum, GLsizei, const GLvoid *);
-void (APIENTRY *GetProgramiv)(GLenum, GLenum, GLint *);
-void (APIENTRY *ProgramEnvParameter4f)(GLenum, GLuint, GLfloat, GLfloat,
+void (GLAPIENTRY *SetFragmentShaderConstant)(GLuint, const GLfloat *);
+void (GLAPIENTRY *ActiveTexture)(GLenum);
+void (GLAPIENTRY *BindTexture)(GLenum, GLuint);
+void (GLAPIENTRY *MultiTexCoord2f)(GLenum, GLfloat, GLfloat);
+void (GLAPIENTRY *GenPrograms)(GLsizei, GLuint *);
+void (GLAPIENTRY *DeletePrograms)(GLsizei, const GLuint *);
+void (GLAPIENTRY *BindProgram)(GLenum, GLuint);
+void (GLAPIENTRY *ProgramString)(GLenum, GLenum, GLsizei, const GLvoid *);
+void (GLAPIENTRY *GetProgramiv)(GLenum, GLenum, GLint *);
+void (GLAPIENTRY *ProgramEnvParameter4f)(GLenum, GLuint, GLfloat, GLfloat,
                                        GLfloat, GLfloat);
-int (APIENTRY *SwapInterval)(int);
-void (APIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei,
+int (GLAPIENTRY *SwapInterval)(int);
+void (GLAPIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei,
                             GLint, GLenum, GLenum, const GLvoid *);
-void* (APIENTRY *AllocateMemoryMESA)(void *, int, size_t, float, float, float);
-void (APIENTRY *FreeMemoryMESA)(void *, int, void *);
+void* (GLAPIENTRY *AllocateMemoryMESA)(void *, int, size_t, float, float, float);
+void (GLAPIENTRY *FreeMemoryMESA)(void *, int, void *);
 /** \} */ // end of glextfunctions group
 
 //! \defgroup glgeneral OpenGL general helper functions
--- a/libvo/gl_common.h	Tue Dec 08 23:58:42 2009 +0000
+++ b/libvo/gl_common.h	Wed Dec 09 17:36:55 2009 +0000
@@ -40,13 +40,13 @@
 #endif
 
 // workaround for some gl.h headers
-#ifndef APIENTRY
-#ifdef GLAPIENTRY
-#define APIENTRY GLAPIENTRY
+#ifndef GLAPIENTRY
+#ifdef APIENTRY
+#define GLAPIENTRY APIENTRY
 #elif defined(GL_WIN32)
-#define APIENTRY __stdcall
+#define GLAPIENTRY __stdcall
 #else
-#define APIENTRY
+#define GLAPIENTRY
 #endif
 #endif
 
@@ -387,82 +387,82 @@
 int init_mpglcontext(MPGLContext *ctx, enum MPGLType type);
 void uninit_mpglcontext(MPGLContext *ctx);
 
-extern void (APIENTRY *Begin)(GLenum);
-extern void (APIENTRY *End)(void);
-extern void (APIENTRY *Viewport)(GLint, GLint, GLsizei, GLsizei);
-extern void (APIENTRY *MatrixMode)(GLenum);
-extern void (APIENTRY *LoadIdentity)(void);
-extern void (APIENTRY *Scaled)(double, double, double);
-extern void (APIENTRY *Ortho)(double, double, double, double, double, double);
-extern void (APIENTRY *PushMatrix)(void);
-extern void (APIENTRY *PopMatrix)(void);
-extern void (APIENTRY *Clear)(GLbitfield);
-extern GLuint (APIENTRY *GenLists)(GLsizei);
-extern void (APIENTRY *DeleteLists)(GLuint, GLsizei);
-extern void (APIENTRY *NewList)(GLuint, GLenum);
-extern void (APIENTRY *EndList)(void);
-extern void (APIENTRY *CallList)(GLuint);
-extern void (APIENTRY *CallLists)(GLsizei, GLenum, const GLvoid *);
-extern void (APIENTRY *GenTextures)(GLsizei, GLuint *);
-extern void (APIENTRY *DeleteTextures)(GLsizei, const GLuint *);
-extern void (APIENTRY *TexEnvi)(GLenum, GLenum, GLint);
-extern void (APIENTRY *Color4ub)(GLubyte, GLubyte, GLubyte, GLubyte);
-extern void (APIENTRY *Color3f)(GLfloat, GLfloat, GLfloat);
-extern void (APIENTRY *ClearColor)(GLclampf, GLclampf, GLclampf, GLclampf);
-extern void (APIENTRY *Enable)(GLenum);
-extern void (APIENTRY *Disable)(GLenum);
-extern const GLubyte *(APIENTRY *GetString)(GLenum);
-extern void (APIENTRY *DrawBuffer)(GLenum);
-extern void (APIENTRY *DepthMask)(GLboolean);
-extern void (APIENTRY *BlendFunc)(GLenum, GLenum);
-extern void (APIENTRY *Flush)(void);
-extern void (APIENTRY *Finish)(void);
-extern void (APIENTRY *PixelStorei)(GLenum, GLint);
-extern void (APIENTRY *TexImage1D)(GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-extern void (APIENTRY *TexImage2D)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-extern void (APIENTRY *TexSubImage2D)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-extern void (APIENTRY *TexParameteri)(GLenum, GLenum, GLint);
-extern void (APIENTRY *TexParameterf)(GLenum, GLenum, GLfloat);
-extern void (APIENTRY *TexParameterfv)(GLenum, GLenum, const GLfloat *);
-extern void (APIENTRY *TexCoord2f)(GLfloat, GLfloat);
-extern void (APIENTRY *Vertex2f)(GLfloat, GLfloat);
-extern void (APIENTRY *GetIntegerv)(GLenum, GLint *);
+extern void (GLAPIENTRY *Begin)(GLenum);
+extern void (GLAPIENTRY *End)(void);
+extern void (GLAPIENTRY *Viewport)(GLint, GLint, GLsizei, GLsizei);
+extern void (GLAPIENTRY *MatrixMode)(GLenum);
+extern void (GLAPIENTRY *LoadIdentity)(void);
+extern void (GLAPIENTRY *Scaled)(double, double, double);
+extern void (GLAPIENTRY *Ortho)(double, double, double, double, double, double);
+extern void (GLAPIENTRY *PushMatrix)(void);
+extern void (GLAPIENTRY *PopMatrix)(void);
+extern void (GLAPIENTRY *Clear)(GLbitfield);
+extern GLuint (GLAPIENTRY *GenLists)(GLsizei);
+extern void (GLAPIENTRY *DeleteLists)(GLuint, GLsizei);
+extern void (GLAPIENTRY *NewList)(GLuint, GLenum);
+extern void (GLAPIENTRY *EndList)(void);
+extern void (GLAPIENTRY *CallList)(GLuint);
+extern void (GLAPIENTRY *CallLists)(GLsizei, GLenum, const GLvoid *);
+extern void (GLAPIENTRY *GenTextures)(GLsizei, GLuint *);
+extern void (GLAPIENTRY *DeleteTextures)(GLsizei, const GLuint *);
+extern void (GLAPIENTRY *TexEnvi)(GLenum, GLenum, GLint);
+extern void (GLAPIENTRY *Color4ub)(GLubyte, GLubyte, GLubyte, GLubyte);
+extern void (GLAPIENTRY *Color3f)(GLfloat, GLfloat, GLfloat);
+extern void (GLAPIENTRY *ClearColor)(GLclampf, GLclampf, GLclampf, GLclampf);
+extern void (GLAPIENTRY *Enable)(GLenum);
+extern void (GLAPIENTRY *Disable)(GLenum);
+extern const GLubyte *(GLAPIENTRY *GetString)(GLenum);
+extern void (GLAPIENTRY *DrawBuffer)(GLenum);
+extern void (GLAPIENTRY *DepthMask)(GLboolean);
+extern void (GLAPIENTRY *BlendFunc)(GLenum, GLenum);
+extern void (GLAPIENTRY *Flush)(void);
+extern void (GLAPIENTRY *Finish)(void);
+extern void (GLAPIENTRY *PixelStorei)(GLenum, GLint);
+extern void (GLAPIENTRY *TexImage1D)(GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+extern void (GLAPIENTRY *TexImage2D)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+extern void (GLAPIENTRY *TexSubImage2D)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+extern void (GLAPIENTRY *TexParameteri)(GLenum, GLenum, GLint);
+extern void (GLAPIENTRY *TexParameterf)(GLenum, GLenum, GLfloat);
+extern void (GLAPIENTRY *TexParameterfv)(GLenum, GLenum, const GLfloat *);
+extern void (GLAPIENTRY *TexCoord2f)(GLfloat, GLfloat);
+extern void (GLAPIENTRY *Vertex2f)(GLfloat, GLfloat);
+extern void (GLAPIENTRY *GetIntegerv)(GLenum, GLint *);
 
-extern void (APIENTRY *GenBuffers)(GLsizei, GLuint *);
-extern void (APIENTRY *DeleteBuffers)(GLsizei, const GLuint *);
-extern void (APIENTRY *BindBuffer)(GLenum, GLuint);
-extern GLvoid* (APIENTRY *MapBuffer)(GLenum, GLenum);
-extern GLboolean (APIENTRY *UnmapBuffer)(GLenum);
-extern void (APIENTRY *BufferData)(GLenum, intptr_t, const GLvoid *, GLenum);
-extern void (APIENTRY *CombinerParameterfv)(GLenum, const GLfloat *);
-extern void (APIENTRY *CombinerParameteri)(GLenum, GLint);
-extern void (APIENTRY *CombinerInput)(GLenum, GLenum, GLenum, GLenum, GLenum,
+extern void (GLAPIENTRY *GenBuffers)(GLsizei, GLuint *);
+extern void (GLAPIENTRY *DeleteBuffers)(GLsizei, const GLuint *);
+extern void (GLAPIENTRY *BindBuffer)(GLenum, GLuint);
+extern GLvoid* (GLAPIENTRY *MapBuffer)(GLenum, GLenum);
+extern GLboolean (GLAPIENTRY *UnmapBuffer)(GLenum);
+extern void (GLAPIENTRY *BufferData)(GLenum, intptr_t, const GLvoid *, GLenum);
+extern void (GLAPIENTRY *CombinerParameterfv)(GLenum, const GLfloat *);
+extern void (GLAPIENTRY *CombinerParameteri)(GLenum, GLint);
+extern void (GLAPIENTRY *CombinerInput)(GLenum, GLenum, GLenum, GLenum, GLenum,
                                       GLenum);
-extern void (APIENTRY *CombinerOutput)(GLenum, GLenum, GLenum, GLenum, GLenum,
+extern void (GLAPIENTRY *CombinerOutput)(GLenum, GLenum, GLenum, GLenum, GLenum,
                                        GLenum, GLenum, GLboolean, GLboolean,
                                        GLboolean);
-extern void (APIENTRY *BeginFragmentShader)(void);
-extern void (APIENTRY *EndFragmentShader)(void);
-extern void (APIENTRY *SampleMap)(GLuint, GLuint, GLenum);
-extern void (APIENTRY *ColorFragmentOp2)(GLenum, GLuint, GLuint, GLuint, GLuint,
+extern void (GLAPIENTRY *BeginFragmentShader)(void);
+extern void (GLAPIENTRY *EndFragmentShader)(void);
+extern void (GLAPIENTRY *SampleMap)(GLuint, GLuint, GLenum);
+extern void (GLAPIENTRY *ColorFragmentOp2)(GLenum, GLuint, GLuint, GLuint, GLuint,
                                          GLuint, GLuint, GLuint, GLuint, GLuint);
-extern void (APIENTRY *ColorFragmentOp3)(GLenum, GLuint, GLuint, GLuint, GLuint,
+extern void (GLAPIENTRY *ColorFragmentOp3)(GLenum, GLuint, GLuint, GLuint, GLuint,
                                          GLuint, GLuint, GLuint, GLuint, GLuint,
                                          GLuint, GLuint, GLuint);
-extern void (APIENTRY *SetFragmentShaderConstant)(GLuint, const GLfloat *);
-extern void (APIENTRY *ActiveTexture)(GLenum);
-extern void (APIENTRY *BindTexture)(GLenum, GLuint);
-extern void (APIENTRY *MultiTexCoord2f)(GLenum, GLfloat, GLfloat);
-extern void (APIENTRY *GenPrograms)(GLsizei, GLuint *);
-extern void (APIENTRY *DeletePrograms)(GLsizei, const GLuint *);
-extern void (APIENTRY *BindProgram)(GLenum, GLuint);
-extern void (APIENTRY *ProgramString)(GLenum, GLenum, GLsizei, const GLvoid *);
-extern void (APIENTRY *ProgramEnvParameter4f)(GLenum, GLuint, GLfloat, GLfloat,
+extern void (GLAPIENTRY *SetFragmentShaderConstant)(GLuint, const GLfloat *);
+extern void (GLAPIENTRY *ActiveTexture)(GLenum);
+extern void (GLAPIENTRY *BindTexture)(GLenum, GLuint);
+extern void (GLAPIENTRY *MultiTexCoord2f)(GLenum, GLfloat, GLfloat);
+extern void (GLAPIENTRY *GenPrograms)(GLsizei, GLuint *);
+extern void (GLAPIENTRY *DeletePrograms)(GLsizei, const GLuint *);
+extern void (GLAPIENTRY *BindProgram)(GLenum, GLuint);
+extern void (GLAPIENTRY *ProgramString)(GLenum, GLenum, GLsizei, const GLvoid *);
+extern void (GLAPIENTRY *ProgramEnvParameter4f)(GLenum, GLuint, GLfloat, GLfloat,
                                               GLfloat, GLfloat);
-extern int (APIENTRY *SwapInterval)(int);
-extern void (APIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei,
+extern int (GLAPIENTRY *SwapInterval)(int);
+extern void (GLAPIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei,
                              GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-extern void* (APIENTRY *AllocateMemoryMESA)(void *, int, size_t, float, float, float);
-extern void (APIENTRY *FreeMemoryMESA)(void *, int, void *);
+extern void* (GLAPIENTRY *AllocateMemoryMESA)(void *, int, size_t, float, float, float);
+extern void (GLAPIENTRY *FreeMemoryMESA)(void *, int, void *);
 
 #endif /* MPLAYER_GL_COMMON_H */