Commit a1b62e49 authored by Thomas Guillem's avatar Thomas Guillem

opengl: sort gl core functions alphabetically

parent 729469b7
......@@ -43,19 +43,19 @@
#if !defined(_WIN32) /* Already defined on Win32 */
typedef void (*PFNGLACTIVETEXTUREPROC) (GLenum texture);
#endif
typedef GLenum (APIENTRY *PFNGLGETERRORPROC) (void);
typedef const GLubyte *(APIENTRY *PFNGLGETSTRINGPROC) (GLenum name);
typedef void (APIENTRY *PFNGLGETINTEGERVPROC) (GLenum pname, GLint *data);
typedef void (APIENTRY *PFNGLBINDTEXTUREPROC) (GLenum target, GLuint texture);
typedef void (APIENTRY *PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
typedef void (APIENTRY *PFNGLTEXPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat param);
typedef void (APIENTRY *PFNGLGENTEXTURESPROC) (GLsizei n, GLuint *textures);
typedef void (APIENTRY *PFNGLBUFFERSTORAGEPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
typedef void (APIENTRY *PFNGLDELETETEXTURESPROC) (GLsizei n, const GLuint *textures);
typedef void (APIENTRY *PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
typedef void (APIENTRY *PFNGLTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
typedef void (APIENTRY *PFNGLGENTEXTURESPROC) (GLsizei n, GLuint *textures);
typedef GLenum (APIENTRY *PFNGLGETERRORPROC) (void);
typedef void (APIENTRY *PFNGLGETINTEGERVPROC) (GLenum pname, GLint *data);
typedef const GLubyte *(APIENTRY *PFNGLGETSTRINGPROC) (GLenum name);
typedef void (APIENTRY *PFNGLGETTEXLEVELPARAMETERIVPROC) (GLenum target, GLint level, GLenum pname, GLint *params);
typedef void (APIENTRY *PFNGLPIXELSTOREIPROC) (GLenum pname, GLint param);
typedef void (APIENTRY *PFNGLBUFFERSTORAGEPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
typedef void (APIENTRY *PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
typedef void (APIENTRY *PFNGLTEXPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat param);
typedef void (APIENTRY *PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
typedef void (APIENTRY *PFNGLTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
/* The following are defined in glext.h but not for GLES2 or on Apple systems */
#if defined(USE_OPENGL_ES2) || defined(__APPLE__)
......@@ -114,16 +114,16 @@ typedef struct {
/*
* GL / GLES core functions
*/
PFNGLBINDTEXTUREPROC BindTexture;
PFNGLDELETETEXTURESPROC DeleteTextures;
PFNGLGENTEXTURESPROC GenTextures;
PFNGLGETERRORPROC GetError;
PFNGLGETSTRINGPROC GetString;
PFNGLGETINTEGERVPROC GetIntegerv;
PFNGLBINDTEXTUREPROC BindTexture;
PFNGLTEXPARAMETERIPROC TexParameteri;
PFNGLTEXPARAMETERFPROC TexParameterf;
PFNGLGETSTRINGPROC GetString;
PFNGLPIXELSTOREIPROC PixelStorei;
PFNGLGENTEXTURESPROC GenTextures;
PFNGLDELETETEXTURESPROC DeleteTextures;
PFNGLTEXIMAGE2DPROC TexImage2D;
PFNGLTEXPARAMETERFPROC TexParameterf;
PFNGLTEXPARAMETERIPROC TexParameteri;
PFNGLTEXSUBIMAGE2DPROC TexSubImage2D;
/* GL only core functions: NULL for GLES2 */
......
......@@ -770,16 +770,16 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
#endif
#define GET_PROC_ADDR_OPTIONAL(name) GET_PROC_ADDR_EXT(name, false) /* GL 3 or more */
GET_PROC_ADDR_CORE(BindTexture);
GET_PROC_ADDR_CORE(DeleteTextures);
GET_PROC_ADDR_CORE(GenTextures);
GET_PROC_ADDR_CORE(GetError);
GET_PROC_ADDR_CORE(GetString);
GET_PROC_ADDR_CORE(GetIntegerv);
GET_PROC_ADDR_CORE(BindTexture);
GET_PROC_ADDR_CORE(TexParameteri);
GET_PROC_ADDR_CORE(TexParameterf);
GET_PROC_ADDR_CORE(GetString);
GET_PROC_ADDR_CORE(PixelStorei);
GET_PROC_ADDR_CORE(GenTextures);
GET_PROC_ADDR_CORE(DeleteTextures);
GET_PROC_ADDR_CORE(TexImage2D);
GET_PROC_ADDR_CORE(TexParameterf);
GET_PROC_ADDR_CORE(TexParameteri);
GET_PROC_ADDR_CORE(TexSubImage2D);
GET_PROC_ADDR_CORE_GL(GetTexLevelParameteriv);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment