From 1b2f7ebe62ce661eb32cc9caf74c6c49c8c5f15a Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 25 Aug 2010 14:39:50 +0200 Subject: Fixed gl3.h GL_GLEXT_PROTOTYPES -> GL3_PROTOTYPES/GL_GL3EXT_PROTOTYPES --- make/stub_includes/opengl/GL3/gl3.h | 8 ++++---- make/stub_includes/opengl/GL3/gl3ext.h | 10 +++++----- make/stub_includes/opengl/gl3-subset.c | 12 ------------ 3 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 make/stub_includes/opengl/gl3-subset.c (limited to 'make/stub_includes') diff --git a/make/stub_includes/opengl/GL3/gl3.h b/make/stub_includes/opengl/GL3/gl3.h index b17cbc055..460d38b15 100644 --- a/make/stub_includes/opengl/GL3/gl3.h +++ b/make/stub_includes/opengl/GL3/gl3.h @@ -3183,9 +3183,9 @@ typedef void (APIENTRYP PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint locati #endif #ifndef GL_ARB_texture_buffer_object #define GL_ARB_texture_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES +#ifdef GL3_PROTOTYPES GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer); -#endif /* GL_GLEXT_PROTOTYPES */ +#endif /* GL3_PROTOTYPES */ typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer); #endif @@ -3224,10 +3224,10 @@ typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalfo #endif #ifndef GL_ARB_draw_instanced #define GL_ARB_draw_instanced 1 -#ifdef GL_GLEXT_PROTOTYPES +#ifdef GL3_PROTOTYPES GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount); GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ +#endif /* GL3_PROTOTYPES */ typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); #endif diff --git a/make/stub_includes/opengl/GL3/gl3ext.h b/make/stub_includes/opengl/GL3/gl3ext.h index d31dd6e13..6c985da67 100644 --- a/make/stub_includes/opengl/GL3/gl3ext.h +++ b/make/stub_includes/opengl/GL3/gl3ext.h @@ -84,12 +84,12 @@ #endif #ifndef GL_ARB_geometry_shader4 #define GL_ARB_geometry_shader4 1 -#ifdef GL_GLEXT_PROTOTYPES +#ifdef GL_GL3EXT_PROTOTYPES GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value); GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level); GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif /* GL_GLEXT_PROTOTYPES */ +#endif /* GL_GL3EXT_PROTOTYPES */ typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value); typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); @@ -113,7 +113,7 @@ typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLen #ifdef GL_GL3EXT_PROTOTYPES GLAPI void APIENTRY glTessellationFactorAMD(GLfloat factor); GLAPI void APIENTRY glTessellationModeAMD(GLenum mode); -#endif +#endif /* GL_GL3EXT_PROTOTYPES */ /* No need for explicit function pointer: we force generation of ProcAddress .. */ #endif @@ -307,12 +307,12 @@ typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severit #endif #ifndef GL_AMD_debug_output #define GL_AMD_debug_output 1 -#ifdef GL_GLEXT_PROTOTYPES +#ifdef GL_GL3EXT_PROTOTYPES GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf); GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, GLvoid *userParam); GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message); -#endif /* GL_GLEXT_PROTOTYPES */ +#endif /* GL_GL3EXT_PROTOTYPES */ typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf); typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, GLvoid *userParam); diff --git a/make/stub_includes/opengl/gl3-subset.c b/make/stub_includes/opengl/gl3-subset.c deleted file mode 100644 index a66cdb2dd..000000000 --- a/make/stub_includes/opengl/gl3-subset.c +++ /dev/null @@ -1,12 +0,0 @@ -#define GLAPI - -// Define GL3_PROTOTYPES so that the OpenGL prototypes in -// "gl3.h" are parsed. -#define GL3_PROTOTYPES - -// Define GL_GL3EXT_PROTOTYPES so that the OpenGL extension prototypes in -// "gl3ext.h" are parsed. -#define GL_GL3EXT_PROTOTYPES - -#include - -- cgit v1.2.3