From 276160f0d5048c372efbba919cf355dcab992167 Mon Sep 17 00:00:00 2001 From: Jonas Kulla Date: Sat, 22 Nov 2014 17:03:16 +0100 Subject: [PATCH] gl-fun.h: Fix compilation with outdated SDL headers --- src/gl-fun.cpp | 10 +-- src/gl-fun.h | 232 ++++++++++++++++++++++++------------------------- 2 files changed, 121 insertions(+), 121 deletions(-) diff --git a/src/gl-fun.cpp b/src/gl-fun.cpp index 46ddff3..f47c0a2 100644 --- a/src/gl-fun.cpp +++ b/src/gl-fun.cpp @@ -29,12 +29,12 @@ GLFunctions gl; -typedef const GLubyte* (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum, GLuint); +typedef const GLubyte* (APIENTRYP _PFNGLGETSTRINGIPROC) (GLenum, GLuint); -static void parseExtensionsCore(PFNGLGETINTEGERVPROC GetIntegerv, BoostSet &out) +static void parseExtensionsCore(_PFNGLGETINTEGERVPROC GetIntegerv, BoostSet &out) { - PFNGLGETSTRINGIPROC GetStringi = - (PFNGLGETSTRINGIPROC) SDL_GL_GetProcAddress("glGetStringi"); + _PFNGLGETSTRINGIPROC GetStringi = + (_PFNGLGETSTRINGIPROC) SDL_GL_GetProcAddress("glGetStringi"); GLint extCount = 0; GetIntegerv(GL_NUM_EXTENSIONS, &extCount); @@ -43,7 +43,7 @@ static void parseExtensionsCore(PFNGLGETINTEGERVPROC GetIntegerv, BoostSet &out) +static void parseExtensionsCompat(_PFNGLGETSTRINGPROC GetString, BoostSet &out) { const char *ext = (const char*) GetString(GL_EXTENSIONS); diff --git a/src/gl-fun.h b/src/gl-fun.h index 42cd4d7..8fb29eb 100644 --- a/src/gl-fun.h +++ b/src/gl-fun.h @@ -30,84 +30,84 @@ #endif /* Etc */ -typedef GLenum (APIENTRYP PFNGLGETERRORPROC) (void); -typedef void (APIENTRYP PFNGLCLEARCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -typedef void (APIENTRYP PFNGLCLEARPROC) (GLbitfield mask); -typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGPROC) (GLenum name); -typedef void (APIENTRYP PFNGLGETINTEGERVPROC) (GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLPIXELSTOREIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); -typedef void (APIENTRYP PFNGLENABLEPROC) (GLenum cap); -typedef void (APIENTRYP PFNGLDISABLEPROC) (GLenum cap); -typedef void (APIENTRYP PFNGLSCISSORPROC) (GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLBLENDFUNCPROC) (GLenum sfactor, GLenum dfactor); -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLDRAWELEMENTSPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices); +typedef GLenum (APIENTRYP _PFNGLGETERRORPROC) (void); +typedef void (APIENTRYP _PFNGLCLEARCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); +typedef void (APIENTRYP _PFNGLCLEARPROC) (GLbitfield mask); +typedef const GLubyte * (APIENTRYP _PFNGLGETSTRINGPROC) (GLenum name); +typedef void (APIENTRYP _PFNGLGETINTEGERVPROC) (GLenum pname, GLint *params); +typedef void (APIENTRYP _PFNGLPIXELSTOREIPROC) (GLenum pname, GLint param); +typedef void (APIENTRYP _PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); +typedef void (APIENTRYP _PFNGLENABLEPROC) (GLenum cap); +typedef void (APIENTRYP _PFNGLDISABLEPROC) (GLenum cap); +typedef void (APIENTRYP _PFNGLSCISSORPROC) (GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP _PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP _PFNGLBLENDFUNCPROC) (GLenum sfactor, GLenum dfactor); +typedef void (APIENTRYP _PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); +typedef void (APIENTRYP _PFNGLBLENDEQUATIONPROC) (GLenum mode); +typedef void (APIENTRYP _PFNGLDRAWELEMENTSPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices); /* Texture */ -typedef void (APIENTRYP PFNGLGENTEXTURESPROC) (GLsizei n, GLuint *textures); -typedef void (APIENTRYP PFNGLDELETETEXTURESPROC) (GLsizei n, const GLuint *textures); -typedef void (APIENTRYP PFNGLBINDTEXTUREPROC) (GLenum target, GLuint texture); -typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); +typedef void (APIENTRYP _PFNGLGENTEXTURESPROC) (GLsizei n, GLuint *textures); +typedef void (APIENTRYP _PFNGLDELETETEXTURESPROC) (GLsizei n, const GLuint *textures); +typedef void (APIENTRYP _PFNGLBINDTEXTUREPROC) (GLenum target, GLuint texture); +typedef void (APIENTRYP _PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); +typedef void (APIENTRYP _PFNGLTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); +typedef void (APIENTRYP _PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param); +typedef void (APIENTRYP _PFNGLACTIVETEXTUREPROC) (GLenum texture); /* Debug callback */ typedef void (APIENTRY * _GLDEBUGPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void *userParam); typedef void (APIENTRYP _PFNGLDEBUGMESSAGECALLBACKPROC) (_GLDEBUGPROC callback, const void *userParam); /* Buffer object */ -typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint* buffers); -typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint* buffers); -typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); -typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage); -typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data); +typedef void (APIENTRYP _PFNGLGENBUFFERSPROC) (GLsizei n, GLuint* buffers); +typedef void (APIENTRYP _PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint* buffers); +typedef void (APIENTRYP _PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); +typedef void (APIENTRYP _PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage); +typedef void (APIENTRYP _PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data); /* Shader */ -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type); -typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader); -typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* const* strings, const GLint* lengths); -typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader); -typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint* param); -typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog); +typedef GLuint (APIENTRYP _PFNGLCREATESHADERPROC) (GLenum type); +typedef void (APIENTRYP _PFNGLDELETESHADERPROC) (GLuint shader); +typedef void (APIENTRYP _PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* const* strings, const GLint* lengths); +typedef void (APIENTRYP _PFNGLCOMPILESHADERPROC) (GLuint shader); +typedef void (APIENTRYP _PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); +typedef void (APIENTRYP _PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint* param); +typedef void (APIENTRYP _PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog); /* Program */ -typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void); -typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint* param); -typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog); +typedef GLuint (APIENTRYP _PFNGLCREATEPROGRAMPROC) (void); +typedef void (APIENTRYP _PFNGLDELETEPROGRAMPROC) (GLuint program); +typedef void (APIENTRYP _PFNGLUSEPROGRAMPROC) (GLuint program); +typedef void (APIENTRYP _PFNGLLINKPROGRAMPROC) (GLuint program); +typedef void (APIENTRYP _PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint* param); +typedef void (APIENTRYP _PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog); /* Uniform */ -typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar* name); -typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); +typedef GLint (APIENTRYP _PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar* name); +typedef void (APIENTRYP _PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0); +typedef void (APIENTRYP _PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1); +typedef void (APIENTRYP _PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); +typedef void (APIENTRYP _PFNGLUNIFORM1IPROC) (GLint location, GLint v0); +typedef void (APIENTRYP _PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); /* Vertex attribute */ -typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar* name); -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* pointer); +typedef void (APIENTRYP _PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar* name); +typedef void (APIENTRYP _PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint); +typedef void (APIENTRYP _PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); +typedef void (APIENTRYP _PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* pointer); /* Framebuffer object */ -typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint* framebuffers); -typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint* framebuffers); -typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +typedef void (APIENTRYP _PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint* framebuffers); +typedef void (APIENTRYP _PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint* framebuffers); +typedef void (APIENTRYP _PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer); +typedef void (APIENTRYP _PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); +typedef void (APIENTRYP _PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* Vertex array object */ -typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint* arrays); -typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint* arrays); -typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array); +typedef void (APIENTRYP _PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint* arrays); +typedef void (APIENTRYP _PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint* arrays); +typedef void (APIENTRYP _PFNGLBINDVERTEXARRAYPROC) (GLuint array); #ifdef GLES2_HEADER #define GL_NUM_EXTENSIONS 0x821D @@ -117,78 +117,78 @@ typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array); #define GL_20_FUN \ /* Etc */ \ - GL_FUN(GetError, PFNGLGETERRORPROC) \ - GL_FUN(ClearColor, PFNGLCLEARCOLORPROC) \ - GL_FUN(Clear, PFNGLCLEARPROC) \ - GL_FUN(GetString, PFNGLGETSTRINGPROC) \ - GL_FUN(GetIntegerv, PFNGLGETINTEGERVPROC) \ - GL_FUN(PixelStorei, PFNGLPIXELSTOREIPROC) \ - GL_FUN(ReadPixels, PFNGLREADPIXELSPROC) \ - GL_FUN(Enable, PFNGLENABLEPROC) \ - GL_FUN(Disable, PFNGLDISABLEPROC) \ - GL_FUN(Scissor, PFNGLSCISSORPROC) \ - GL_FUN(Viewport, PFNGLVIEWPORTPROC) \ - GL_FUN(BlendFunc, PFNGLBLENDFUNCPROC) \ - GL_FUN(BlendFuncSeparate, PFNGLBLENDFUNCSEPARATEPROC) \ - GL_FUN(BlendEquation, PFNGLBLENDEQUATIONPROC) \ - GL_FUN(DrawElements, PFNGLDRAWELEMENTSPROC) \ + GL_FUN(GetError, _PFNGLGETERRORPROC) \ + GL_FUN(ClearColor, _PFNGLCLEARCOLORPROC) \ + GL_FUN(Clear, _PFNGLCLEARPROC) \ + GL_FUN(GetString, _PFNGLGETSTRINGPROC) \ + GL_FUN(GetIntegerv, _PFNGLGETINTEGERVPROC) \ + GL_FUN(PixelStorei, _PFNGLPIXELSTOREIPROC) \ + GL_FUN(ReadPixels, _PFNGLREADPIXELSPROC) \ + GL_FUN(Enable, _PFNGLENABLEPROC) \ + GL_FUN(Disable, _PFNGLDISABLEPROC) \ + GL_FUN(Scissor, _PFNGLSCISSORPROC) \ + GL_FUN(Viewport, _PFNGLVIEWPORTPROC) \ + GL_FUN(BlendFunc, _PFNGLBLENDFUNCPROC) \ + GL_FUN(BlendFuncSeparate, _PFNGLBLENDFUNCSEPARATEPROC) \ + GL_FUN(BlendEquation, _PFNGLBLENDEQUATIONPROC) \ + GL_FUN(DrawElements, _PFNGLDRAWELEMENTSPROC) \ /* Texture */ \ - GL_FUN(GenTextures, PFNGLGENTEXTURESPROC) \ - GL_FUN(DeleteTextures, PFNGLDELETETEXTURESPROC) \ - GL_FUN(BindTexture, PFNGLBINDTEXTUREPROC) \ - GL_FUN(TexImage2D, PFNGLTEXIMAGE2DPROC) \ - GL_FUN(TexSubImage2D, PFNGLTEXSUBIMAGE2DPROC) \ - GL_FUN(TexParameteri, PFNGLTEXPARAMETERIPROC) \ - GL_FUN(ActiveTexture, PFNGLACTIVETEXTUREPROC) \ + GL_FUN(GenTextures, _PFNGLGENTEXTURESPROC) \ + GL_FUN(DeleteTextures, _PFNGLDELETETEXTURESPROC) \ + GL_FUN(BindTexture, _PFNGLBINDTEXTUREPROC) \ + GL_FUN(TexImage2D, _PFNGLTEXIMAGE2DPROC) \ + GL_FUN(TexSubImage2D, _PFNGLTEXSUBIMAGE2DPROC) \ + GL_FUN(TexParameteri, _PFNGLTEXPARAMETERIPROC) \ + GL_FUN(ActiveTexture, _PFNGLACTIVETEXTUREPROC) \ /* Buffer object */ \ - GL_FUN(GenBuffers, PFNGLGENBUFFERSPROC) \ - GL_FUN(DeleteBuffers, PFNGLDELETEBUFFERSPROC) \ - GL_FUN(BindBuffer, PFNGLBINDBUFFERPROC) \ - GL_FUN(BufferData, PFNGLBUFFERDATAPROC) \ - GL_FUN(BufferSubData, PFNGLBUFFERSUBDATAPROC) \ + GL_FUN(GenBuffers, _PFNGLGENBUFFERSPROC) \ + GL_FUN(DeleteBuffers, _PFNGLDELETEBUFFERSPROC) \ + GL_FUN(BindBuffer, _PFNGLBINDBUFFERPROC) \ + GL_FUN(BufferData, _PFNGLBUFFERDATAPROC) \ + GL_FUN(BufferSubData, _PFNGLBUFFERSUBDATAPROC) \ /* Shader */ \ - GL_FUN(CreateShader, PFNGLCREATESHADERPROC) \ - GL_FUN(DeleteShader, PFNGLDELETESHADERPROC) \ - GL_FUN(ShaderSource, PFNGLSHADERSOURCEPROC) \ - GL_FUN(CompileShader, PFNGLCOMPILESHADERPROC) \ - GL_FUN(AttachShader, PFNGLATTACHSHADERPROC) \ - GL_FUN(GetShaderiv, PFNGLGETSHADERIVPROC) \ - GL_FUN(GetShaderInfoLog, PFNGLGETSHADERINFOLOGPROC) \ + GL_FUN(CreateShader, _PFNGLCREATESHADERPROC) \ + GL_FUN(DeleteShader, _PFNGLDELETESHADERPROC) \ + GL_FUN(ShaderSource, _PFNGLSHADERSOURCEPROC) \ + GL_FUN(CompileShader, _PFNGLCOMPILESHADERPROC) \ + GL_FUN(AttachShader, _PFNGLATTACHSHADERPROC) \ + GL_FUN(GetShaderiv, _PFNGLGETSHADERIVPROC) \ + GL_FUN(GetShaderInfoLog, _PFNGLGETSHADERINFOLOGPROC) \ /* Program */ \ - GL_FUN(CreateProgram, PFNGLCREATEPROGRAMPROC) \ - GL_FUN(DeleteProgram, PFNGLDELETEPROGRAMPROC) \ - GL_FUN(UseProgram, PFNGLUSEPROGRAMPROC) \ - GL_FUN(LinkProgram, PFNGLLINKPROGRAMPROC) \ - GL_FUN(GetProgramiv, PFNGLGETPROGRAMIVPROC) \ - GL_FUN(GetProgramInfoLog, PFNGLGETPROGRAMINFOLOGPROC) \ + GL_FUN(CreateProgram, _PFNGLCREATEPROGRAMPROC) \ + GL_FUN(DeleteProgram, _PFNGLDELETEPROGRAMPROC) \ + GL_FUN(UseProgram, _PFNGLUSEPROGRAMPROC) \ + GL_FUN(LinkProgram, _PFNGLLINKPROGRAMPROC) \ + GL_FUN(GetProgramiv, _PFNGLGETPROGRAMIVPROC) \ + GL_FUN(GetProgramInfoLog, _PFNGLGETPROGRAMINFOLOGPROC) \ /* Uniform */ \ - GL_FUN(GetUniformLocation, PFNGLGETUNIFORMLOCATIONPROC) \ - GL_FUN(Uniform1f, PFNGLUNIFORM1FPROC) \ - GL_FUN(Uniform2f, PFNGLUNIFORM2FPROC) \ - GL_FUN(Uniform4f, PFNGLUNIFORM4FPROC) \ - GL_FUN(Uniform1i, PFNGLUNIFORM1IPROC) \ - GL_FUN(UniformMatrix4fv, PFNGLUNIFORMMATRIX4FVPROC) \ + GL_FUN(GetUniformLocation, _PFNGLGETUNIFORMLOCATIONPROC) \ + GL_FUN(Uniform1f, _PFNGLUNIFORM1FPROC) \ + GL_FUN(Uniform2f, _PFNGLUNIFORM2FPROC) \ + GL_FUN(Uniform4f, _PFNGLUNIFORM4FPROC) \ + GL_FUN(Uniform1i, _PFNGLUNIFORM1IPROC) \ + GL_FUN(UniformMatrix4fv, _PFNGLUNIFORMMATRIX4FVPROC) \ /* Vertex attribute */ \ - GL_FUN(BindAttribLocation, PFNGLBINDATTRIBLOCATIONPROC) \ - GL_FUN(EnableVertexAttribArray, PFNGLENABLEVERTEXATTRIBARRAYPROC) \ - GL_FUN(DisableVertexAttribArray, PFNGLDISABLEVERTEXATTRIBARRAYPROC) \ - GL_FUN(VertexAttribPointer, PFNGLVERTEXATTRIBPOINTERPROC) + GL_FUN(BindAttribLocation, _PFNGLBINDATTRIBLOCATIONPROC) \ + GL_FUN(EnableVertexAttribArray, _PFNGLENABLEVERTEXATTRIBARRAYPROC) \ + GL_FUN(DisableVertexAttribArray, _PFNGLDISABLEVERTEXATTRIBARRAYPROC) \ + GL_FUN(VertexAttribPointer, _PFNGLVERTEXATTRIBPOINTERPROC) #define GL_FBO_FUN \ /* Framebuffer object */ \ - GL_FUN(GenFramebuffers, PFNGLGENFRAMEBUFFERSPROC) \ - GL_FUN(DeleteFramebuffers, PFNGLDELETEFRAMEBUFFERSPROC) \ - GL_FUN(BindFramebuffer, PFNGLBINDFRAMEBUFFERPROC) \ - GL_FUN(FramebufferTexture2D, PFNGLFRAMEBUFFERTEXTURE2DPROC) + GL_FUN(GenFramebuffers, _PFNGLGENFRAMEBUFFERSPROC) \ + GL_FUN(DeleteFramebuffers, _PFNGLDELETEFRAMEBUFFERSPROC) \ + GL_FUN(BindFramebuffer, _PFNGLBINDFRAMEBUFFERPROC) \ + GL_FUN(FramebufferTexture2D, _PFNGLFRAMEBUFFERTEXTURE2DPROC) #define GL_FBO_BLIT_FUN \ - GL_FUN(BlitFramebuffer, PFNGLBLITFRAMEBUFFERPROC) + GL_FUN(BlitFramebuffer, _PFNGLBLITFRAMEBUFFERPROC) #define GL_VAO_FUN \ /* Vertex array object */ \ - GL_FUN(GenVertexArrays, PFNGLGENVERTEXARRAYSPROC) \ - GL_FUN(DeleteVertexArrays, PFNGLDELETEVERTEXARRAYSPROC) \ - GL_FUN(BindVertexArray, PFNGLBINDVERTEXARRAYPROC) + GL_FUN(GenVertexArrays, _PFNGLGENVERTEXARRAYSPROC) \ + GL_FUN(DeleteVertexArrays, _PFNGLDELETEVERTEXARRAYSPROC) \ + GL_FUN(BindVertexArray, _PFNGLBINDVERTEXARRAYPROC) #define GL_DEBUG_KHR_FUN \ GL_FUN(DebugMessageCallback, _PFNGLDEBUGMESSAGECALLBACKPROC)