From e18ee475106da5dcf31dd1780a39ba3b54c80f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 18 Jul 2015 13:09:30 +0200 Subject: [PATCH] External: flextGL now respects API/profile restrictions for extensions. --- src/MagnumExternal/OpenGL/GL/flextGL.cpp | 12 --- src/MagnumExternal/OpenGL/GL/flextGL.h | 24 ----- .../OpenGL/GL/flextGLPlatform.cpp | 12 --- src/MagnumExternal/OpenGL/GLES2/flextGL.cpp | 22 ----- src/MagnumExternal/OpenGL/GLES2/flextGL.h | 97 ------------------- .../OpenGL/GLES2/flextGLEmscripten.h | 3 - src/MagnumExternal/OpenGL/GLES2/flextGLNaCl.h | 97 ------------------- .../OpenGL/GLES2/flextGLPlatform.cpp | 20 ---- src/MagnumExternal/OpenGL/GLES3/flextGL.cpp | 19 ---- src/MagnumExternal/OpenGL/GLES3/flextGL.h | 93 ------------------ .../OpenGL/GLES3/flextGLPlatform.cpp | 19 ---- 11 files changed, 418 deletions(-) diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.cpp b/src/MagnumExternal/OpenGL/GL/flextGL.cpp index 62254b932..1d7a507d8 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.cpp +++ b/src/MagnumExternal/OpenGL/GL/flextGL.cpp @@ -31,19 +31,7 @@ FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawElementsIndirectCountARB)(GLenum, /* GL_ARB_robustness */ FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusARB)(void) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnColorTableARB)(GLenum, GLenum, GLenum, GLsizei, void *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnCompressedTexImageARB)(GLenum, GLint, GLsizei, void *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnConvolutionFilterARB)(GLenum, GLenum, GLenum, GLsizei, void *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnHistogramARB)(GLenum, GLboolean, GLenum, GLenum, GLsizei, void *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnMapdvARB)(GLenum, GLenum, GLsizei, GLdouble *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnMapfvARB)(GLenum, GLenum, GLsizei, GLfloat *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnMapivARB)(GLenum, GLenum, GLsizei, GLint *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnMinmaxARB)(GLenum, GLboolean, GLenum, GLenum, GLsizei, void *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnPixelMapfvARB)(GLenum, GLsizei, GLfloat *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnPixelMapuivARB)(GLenum, GLsizei, GLuint *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnPixelMapusvARB)(GLenum, GLsizei, GLushort *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnPolygonStippleARB)(GLsizei, GLubyte *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnSeparableFilterARB)(GLenum, GLenum, GLenum, GLsizei, void *, GLsizei, void *, void *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnTexImageARB)(GLenum, GLint, GLenum, GLenum, GLsizei, void *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformdvARB)(GLuint, GLint, GLsizei, GLdouble *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformfvARB)(GLuint, GLint, GLsizei, GLfloat *) = nullptr; diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h b/src/MagnumExternal/OpenGL/GL/flextGL.h index a6c50e646..1197e6d0d 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.h +++ b/src/MagnumExternal/OpenGL/GL/flextGL.h @@ -1804,32 +1804,8 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawElementsIndirectCountARB)(GL GLAPI FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusARB)(void); #define glGetGraphicsResetStatusARB flextglGetGraphicsResetStatusARB -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnColorTableARB)(GLenum, GLenum, GLenum, GLsizei, void *); -#define glGetnColorTableARB flextglGetnColorTableARB GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnCompressedTexImageARB)(GLenum, GLint, GLsizei, void *); #define glGetnCompressedTexImageARB flextglGetnCompressedTexImageARB -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnConvolutionFilterARB)(GLenum, GLenum, GLenum, GLsizei, void *); -#define glGetnConvolutionFilterARB flextglGetnConvolutionFilterARB -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnHistogramARB)(GLenum, GLboolean, GLenum, GLenum, GLsizei, void *); -#define glGetnHistogramARB flextglGetnHistogramARB -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnMapdvARB)(GLenum, GLenum, GLsizei, GLdouble *); -#define glGetnMapdvARB flextglGetnMapdvARB -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnMapfvARB)(GLenum, GLenum, GLsizei, GLfloat *); -#define glGetnMapfvARB flextglGetnMapfvARB -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnMapivARB)(GLenum, GLenum, GLsizei, GLint *); -#define glGetnMapivARB flextglGetnMapivARB -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnMinmaxARB)(GLenum, GLboolean, GLenum, GLenum, GLsizei, void *); -#define glGetnMinmaxARB flextglGetnMinmaxARB -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnPixelMapfvARB)(GLenum, GLsizei, GLfloat *); -#define glGetnPixelMapfvARB flextglGetnPixelMapfvARB -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnPixelMapuivARB)(GLenum, GLsizei, GLuint *); -#define glGetnPixelMapuivARB flextglGetnPixelMapuivARB -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnPixelMapusvARB)(GLenum, GLsizei, GLushort *); -#define glGetnPixelMapusvARB flextglGetnPixelMapusvARB -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnPolygonStippleARB)(GLsizei, GLubyte *); -#define glGetnPolygonStippleARB flextglGetnPolygonStippleARB -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnSeparableFilterARB)(GLenum, GLenum, GLenum, GLsizei, void *, GLsizei, void *, void *); -#define glGetnSeparableFilterARB flextglGetnSeparableFilterARB GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnTexImageARB)(GLenum, GLint, GLenum, GLenum, GLsizei, void *); #define glGetnTexImageARB flextglGetnTexImageARB GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformdvARB)(GLuint, GLint, GLsizei, GLdouble *); diff --git a/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp b/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp index ffb3c4b2f..6ffac73e4 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp +++ b/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp @@ -41,19 +41,7 @@ void flextGLInit() { /* GL_ARB_robustness */ flextglGetGraphicsResetStatusARB = reinterpret_cast(loader.load("glGetGraphicsResetStatusARB")); - flextglGetnColorTableARB = reinterpret_cast(loader.load("glGetnColorTableARB")); flextglGetnCompressedTexImageARB = reinterpret_cast(loader.load("glGetnCompressedTexImageARB")); - flextglGetnConvolutionFilterARB = reinterpret_cast(loader.load("glGetnConvolutionFilterARB")); - flextglGetnHistogramARB = reinterpret_cast(loader.load("glGetnHistogramARB")); - flextglGetnMapdvARB = reinterpret_cast(loader.load("glGetnMapdvARB")); - flextglGetnMapfvARB = reinterpret_cast(loader.load("glGetnMapfvARB")); - flextglGetnMapivARB = reinterpret_cast(loader.load("glGetnMapivARB")); - flextglGetnMinmaxARB = reinterpret_cast(loader.load("glGetnMinmaxARB")); - flextglGetnPixelMapfvARB = reinterpret_cast(loader.load("glGetnPixelMapfvARB")); - flextglGetnPixelMapuivARB = reinterpret_cast(loader.load("glGetnPixelMapuivARB")); - flextglGetnPixelMapusvARB = reinterpret_cast(loader.load("glGetnPixelMapusvARB")); - flextglGetnPolygonStippleARB = reinterpret_cast(loader.load("glGetnPolygonStippleARB")); - flextglGetnSeparableFilterARB = reinterpret_cast(loader.load("glGetnSeparableFilterARB")); flextglGetnTexImageARB = reinterpret_cast(loader.load("glGetnTexImageARB")); flextglGetnUniformdvARB = reinterpret_cast(loader.load("glGetnUniformdvARB")); flextglGetnUniformfvARB = reinterpret_cast(loader.load("glGetnUniformfvARB")); diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGL.cpp b/src/MagnumExternal/OpenGL/GLES2/flextGL.cpp index c3506f6ed..de1caad84 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGL.cpp +++ b/src/MagnumExternal/OpenGL/GLES2/flextGL.cpp @@ -19,9 +19,6 @@ FLEXTGL_EXPORT void(APIENTRY *flextglVertexAttribDivisorANGLE)(GLuint, GLuint) = FLEXTGL_EXPORT void(APIENTRY *flextglRenderbufferStorageMultisampleAPPLE)(GLenum, GLsizei, GLenum, GLsizei, GLsizei) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglResolveMultisampleFramebufferAPPLE)(void) = nullptr; -/* GL_EXT_blend_minmax */ -FLEXTGL_EXPORT void(APIENTRY *flextglBlendEquationEXT)(GLenum) = nullptr; - /* GL_EXT_debug_label */ FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabelEXT)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglLabelObjectEXT)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr; @@ -86,10 +83,8 @@ FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformivEXT)(GLuint, GLint, GLsizei, G FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsEXT)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *) = nullptr; /* GL_EXT_separate_shader_objects */ -FLEXTGL_EXPORT void(APIENTRY *flextglActiveProgramEXT)(GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglActiveShaderProgramEXT)(GLuint, GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglBindProgramPipelineEXT)(GLuint) = nullptr; -FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateShaderProgramEXT)(GLenum, const GLchar *) = nullptr; FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateShaderProgramvEXT)(GLenum, GLsizei, const GLchar **) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglDeleteProgramPipelinesEXT)(GLsizei, const GLuint *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGenProgramPipelinesEXT)(GLsizei, GLuint *) = nullptr; @@ -131,7 +126,6 @@ FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4fvEXT)(GLuint, GLint, FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x2fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x3fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglUseProgramStagesEXT)(GLuint, GLbitfield, GLuint) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglUseShaderProgramEXT)(GLenum, GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglValidateProgramPipelineEXT)(GLuint) = nullptr; /* GL_EXT_texture_border_clamp */ @@ -156,39 +150,23 @@ FLEXTGL_EXPORT void(APIENTRY *flextglTextureStorage3DEXT)(GLuint, GLenum, GLsize FLEXTGL_EXPORT void(APIENTRY *flextglBlendBarrierKHR)(void) = nullptr; /* GL_KHR_debug */ -FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageCallback)(GLDEBUGPROC, const void *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageCallbackKHR)(GLDEBUGPROCKHR, const void *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageControl)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageControlKHR)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageInsert)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageInsertKHR)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *) = nullptr; -FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetDebugMessageLog)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *) = nullptr; FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetDebugMessageLogKHR)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabel)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabelKHR)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectPtrLabel)(const void *, GLsizei, GLsizei *, GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectPtrLabelKHR)(const void *, GLsizei, GLsizei *, GLchar *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetPointerv)(GLenum, void **) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetPointervKHR)(GLenum, void **) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabel)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabelKHR)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabel)(const void *, GLsizei, const GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabelKHR)(const void *, GLsizei, const GLchar *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroup)(void) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroupKHR)(void) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroup)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroupKHR)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr; /* GL_KHR_robustness */ -FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatus)(void) = nullptr; FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusKHR)(void) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformfv)(GLuint, GLint, GLsizei, GLfloat *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformfvKHR)(GLuint, GLint, GLsizei, GLfloat *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformiv)(GLuint, GLint, GLsizei, GLint *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformivKHR)(GLuint, GLint, GLsizei, GLint *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformuiv)(GLuint, GLint, GLsizei, GLuint *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformuivKHR)(GLuint, GLint, GLsizei, GLuint *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixels)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsKHR)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *) = nullptr; /* GL_NV_draw_buffers */ diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGL.h b/src/MagnumExternal/OpenGL/GLES2/flextGL.h index 2d74c3a08..3fe983ed3 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES2/flextGL.h @@ -69,7 +69,6 @@ typedef unsigned int GLuint; typedef int GLsizei; typedef char GLchar; typedef struct __GLsync *GLsync; -typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); typedef khronos_int8_t GLbyte; typedef khronos_uint8_t GLubyte; @@ -443,8 +442,6 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_MIN_EXT 0x8007 #define GL_MAX_EXT 0x8008 -#define GL_FUNC_ADD_EXT 0x8006 -#define GL_BLEND_EQUATION_EXT 0x8009 /* GL_EXT_occlusion_query_boolean */ @@ -801,7 +798,6 @@ typedef khronos_ssize_t GLsizeiptr; /* GL_EXT_separate_shader_objects */ -#define GL_ACTIVE_PROGRAM_EXT 0x8259 #define GL_VERTEX_SHADER_BIT_EXT 0x00000001 #define GL_FRAGMENT_SHADER_BIT_EXT 0x00000002 #define GL_ALL_SHADER_BITS_EXT 0xFFFFFFFF @@ -891,46 +887,6 @@ typedef khronos_ssize_t GLsizeiptr; /* GL_KHR_debug */ -#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 -#define GL_DEBUG_SOURCE_API 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION 0x824A -#define GL_DEBUG_SOURCE_OTHER 0x824B -#define GL_DEBUG_TYPE_ERROR 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E -#define GL_DEBUG_TYPE_PORTABILITY 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 -#define GL_DEBUG_TYPE_OTHER 0x8251 -#define GL_DEBUG_TYPE_MARKER 0x8268 -#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 -#define GL_DEBUG_TYPE_POP_GROUP 0x826A -#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B -#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C -#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D -#define GL_BUFFER 0x82E0 -#define GL_SHADER 0x82E1 -#define GL_PROGRAM 0x82E2 -#define GL_VERTEX_ARRAY 0x8074 -#define GL_QUERY 0x82E3 -#define GL_PROGRAM_PIPELINE 0x82E4 -#define GL_SAMPLER 0x82E6 -#define GL_MAX_LABEL_LENGTH 0x82E8 -#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES 0x9145 -#define GL_DEBUG_SEVERITY_HIGH 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 -#define GL_DEBUG_SEVERITY_LOW 0x9148 -#define GL_DEBUG_OUTPUT 0x92E0 -#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 -#define GL_STACK_OVERFLOW 0x0503 -#define GL_STACK_UNDERFLOW 0x0504 #define GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR 0x8242 #define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR 0x8243 #define GL_DEBUG_CALLBACK_FUNCTION_KHR 0x8244 @@ -971,7 +927,6 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_CONTEXT_FLAG_DEBUG_BIT_KHR 0x00000002 #define GL_STACK_OVERFLOW_KHR 0x0503 #define GL_STACK_UNDERFLOW_KHR 0x0504 -#define GL_DISPLAY_LIST 0x82E7 /* GL_KHR_blend_equation_advanced */ @@ -997,15 +952,6 @@ typedef khronos_ssize_t GLsizeiptr; /* GL_KHR_robustness */ -#define GL_NO_ERROR 0 -#define GL_CONTEXT_ROBUST_ACCESS 0x90F3 -#define GL_LOSE_CONTEXT_ON_RESET 0x8252 -#define GL_GUILTY_CONTEXT_RESET 0x8253 -#define GL_INNOCENT_CONTEXT_RESET 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET 0x8255 -#define GL_RESET_NOTIFICATION_STRATEGY 0x8256 -#define GL_NO_RESET_NOTIFICATION 0x8261 -#define GL_CONTEXT_LOST 0x0507 #define GL_NO_ERROR 0 #define GL_CONTEXT_ROBUST_ACCESS_KHR 0x90F3 #define GL_LOSE_CONTEXT_ON_RESET_KHR 0x8252 @@ -1018,9 +964,6 @@ typedef khronos_ssize_t GLsizeiptr; /* GL_KHR_context_flush_control */ -#define GL_CONTEXT_RELEASE_BEHAVIOR 0x82FB -#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC -#define GL_NONE 0 #define GL_CONTEXT_RELEASE_BEHAVIOR_KHR 0x82FB #define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR 0x82FC #define GL_NONE 0 @@ -1250,8 +1193,6 @@ GLAPI FLEXTGL_EXPORT void APIENTRY glViewport(GLint, GLint, GLsizei, GLsizei); /* GL_EXT_blend_minmax */ -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglBlendEquationEXT)(GLenum); -#define glBlendEquationEXT flextglBlendEquationEXT /* GL_EXT_debug_label */ @@ -1381,14 +1322,10 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsEXT)(GLint, GLint, GLsizei /* GL_EXT_separate_shader_objects */ -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglActiveProgramEXT)(GLuint); -#define glActiveProgramEXT flextglActiveProgramEXT GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglActiveShaderProgramEXT)(GLuint, GLuint); #define glActiveShaderProgramEXT flextglActiveShaderProgramEXT GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglBindProgramPipelineEXT)(GLuint); #define glBindProgramPipelineEXT flextglBindProgramPipelineEXT -GLAPI FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateShaderProgramEXT)(GLenum, const GLchar *); -#define glCreateShaderProgramEXT flextglCreateShaderProgramEXT GLAPI FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateShaderProgramvEXT)(GLenum, GLsizei, const GLchar **); #define glCreateShaderProgramvEXT flextglCreateShaderProgramvEXT GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDeleteProgramPipelinesEXT)(GLsizei, const GLuint *); @@ -1471,8 +1408,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x3fvEXT)(GLuint, #define glProgramUniformMatrix4x3fvEXT flextglProgramUniformMatrix4x3fvEXT GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglUseProgramStagesEXT)(GLuint, GLbitfield, GLuint); #define glUseProgramStagesEXT flextglUseProgramStagesEXT -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglUseShaderProgramEXT)(GLenum, GLuint); -#define glUseShaderProgramEXT flextglUseShaderProgramEXT GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglValidateProgramPipelineEXT)(GLuint); #define glValidateProgramPipelineEXT flextglValidateProgramPipelineEXT @@ -1544,48 +1479,26 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglBlendBarrierKHR)(void); /* GL_KHR_debug */ -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageCallback)(GLDEBUGPROC, const void *); -#define glDebugMessageCallback flextglDebugMessageCallback GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageCallbackKHR)(GLDEBUGPROCKHR, const void *); #define glDebugMessageCallbackKHR flextglDebugMessageCallbackKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageControl)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean); -#define glDebugMessageControl flextglDebugMessageControl GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageControlKHR)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean); #define glDebugMessageControlKHR flextglDebugMessageControlKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageInsert)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *); -#define glDebugMessageInsert flextglDebugMessageInsert GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageInsertKHR)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *); #define glDebugMessageInsertKHR flextglDebugMessageInsertKHR -GLAPI FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetDebugMessageLog)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *); -#define glGetDebugMessageLog flextglGetDebugMessageLog GLAPI FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetDebugMessageLogKHR)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *); #define glGetDebugMessageLogKHR flextglGetDebugMessageLogKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabel)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *); -#define glGetObjectLabel flextglGetObjectLabel GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabelKHR)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *); #define glGetObjectLabelKHR flextglGetObjectLabelKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectPtrLabel)(const void *, GLsizei, GLsizei *, GLchar *); -#define glGetObjectPtrLabel flextglGetObjectPtrLabel GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectPtrLabelKHR)(const void *, GLsizei, GLsizei *, GLchar *); #define glGetObjectPtrLabelKHR flextglGetObjectPtrLabelKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetPointerv)(GLenum, void **); -#define glGetPointerv flextglGetPointerv GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetPointervKHR)(GLenum, void **); #define glGetPointervKHR flextglGetPointervKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabel)(GLenum, GLuint, GLsizei, const GLchar *); -#define glObjectLabel flextglObjectLabel GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabelKHR)(GLenum, GLuint, GLsizei, const GLchar *); #define glObjectLabelKHR flextglObjectLabelKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabel)(const void *, GLsizei, const GLchar *); -#define glObjectPtrLabel flextglObjectPtrLabel GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabelKHR)(const void *, GLsizei, const GLchar *); #define glObjectPtrLabelKHR flextglObjectPtrLabelKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroup)(void); -#define glPopDebugGroup flextglPopDebugGroup GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroupKHR)(void); #define glPopDebugGroupKHR flextglPopDebugGroupKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroup)(GLenum, GLuint, GLsizei, const GLchar *); -#define glPushDebugGroup flextglPushDebugGroup GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroupKHR)(GLenum, GLuint, GLsizei, const GLchar *); #define glPushDebugGroupKHR flextglPushDebugGroupKHR @@ -1594,24 +1507,14 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroupKHR)(GLenum, GLuint, GL /* GL_KHR_robustness */ -GLAPI FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatus)(void); -#define glGetGraphicsResetStatus flextglGetGraphicsResetStatus GLAPI FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusKHR)(void); #define glGetGraphicsResetStatusKHR flextglGetGraphicsResetStatusKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformfv)(GLuint, GLint, GLsizei, GLfloat *); -#define glGetnUniformfv flextglGetnUniformfv GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformfvKHR)(GLuint, GLint, GLsizei, GLfloat *); #define glGetnUniformfvKHR flextglGetnUniformfvKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformiv)(GLuint, GLint, GLsizei, GLint *); -#define glGetnUniformiv flextglGetnUniformiv GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformivKHR)(GLuint, GLint, GLsizei, GLint *); #define glGetnUniformivKHR flextglGetnUniformivKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformuiv)(GLuint, GLint, GLsizei, GLuint *); -#define glGetnUniformuiv flextglGetnUniformuiv GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformuivKHR)(GLuint, GLint, GLsizei, GLuint *); #define glGetnUniformuivKHR flextglGetnUniformuivKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixels)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *); -#define glReadnPixels flextglReadnPixels GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsKHR)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *); #define glReadnPixelsKHR flextglReadnPixelsKHR diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h b/src/MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h index 5e83ef891..ccdcb060e 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h +++ b/src/MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h @@ -367,8 +367,6 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_MIN_EXT 0x8007 #define GL_MAX_EXT 0x8008 -#define GL_FUNC_ADD_EXT 0x8006 -#define GL_BLEND_EQUATION_EXT 0x8009 /* GL_EXT_sRGB */ @@ -608,7 +606,6 @@ GLAPI void glViewport(GLint, GLint, GLsizei, GLsizei); /* GL_EXT_blend_minmax */ -GLAPI void glBlendEquationEXT(GLenum); /* GL_EXT_draw_buffers */ diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLNaCl.h b/src/MagnumExternal/OpenGL/GLES2/flextGLNaCl.h index c808633bb..b5f2ff7ae 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGLNaCl.h +++ b/src/MagnumExternal/OpenGL/GLES2/flextGLNaCl.h @@ -44,7 +44,6 @@ typedef unsigned int GLuint; typedef int GLsizei; typedef char GLchar; typedef struct __GLsync *GLsync; -typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); typedef khronos_int8_t GLbyte; typedef khronos_uint8_t GLubyte; @@ -418,8 +417,6 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_MIN_EXT 0x8007 #define GL_MAX_EXT 0x8008 -#define GL_FUNC_ADD_EXT 0x8006 -#define GL_BLEND_EQUATION_EXT 0x8009 /* GL_EXT_occlusion_query_boolean */ @@ -776,7 +773,6 @@ typedef khronos_ssize_t GLsizeiptr; /* GL_EXT_separate_shader_objects */ -#define GL_ACTIVE_PROGRAM_EXT 0x8259 #define GL_VERTEX_SHADER_BIT_EXT 0x00000001 #define GL_FRAGMENT_SHADER_BIT_EXT 0x00000002 #define GL_ALL_SHADER_BITS_EXT 0xFFFFFFFF @@ -866,46 +862,6 @@ typedef khronos_ssize_t GLsizeiptr; /* GL_KHR_debug */ -#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 -#define GL_DEBUG_SOURCE_API 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION 0x824A -#define GL_DEBUG_SOURCE_OTHER 0x824B -#define GL_DEBUG_TYPE_ERROR 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E -#define GL_DEBUG_TYPE_PORTABILITY 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 -#define GL_DEBUG_TYPE_OTHER 0x8251 -#define GL_DEBUG_TYPE_MARKER 0x8268 -#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 -#define GL_DEBUG_TYPE_POP_GROUP 0x826A -#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B -#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C -#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D -#define GL_BUFFER 0x82E0 -#define GL_SHADER 0x82E1 -#define GL_PROGRAM 0x82E2 -#define GL_VERTEX_ARRAY 0x8074 -#define GL_QUERY 0x82E3 -#define GL_PROGRAM_PIPELINE 0x82E4 -#define GL_SAMPLER 0x82E6 -#define GL_MAX_LABEL_LENGTH 0x82E8 -#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES 0x9145 -#define GL_DEBUG_SEVERITY_HIGH 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 -#define GL_DEBUG_SEVERITY_LOW 0x9148 -#define GL_DEBUG_OUTPUT 0x92E0 -#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 -#define GL_STACK_OVERFLOW 0x0503 -#define GL_STACK_UNDERFLOW 0x0504 #define GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR 0x8242 #define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR 0x8243 #define GL_DEBUG_CALLBACK_FUNCTION_KHR 0x8244 @@ -946,7 +902,6 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_CONTEXT_FLAG_DEBUG_BIT_KHR 0x00000002 #define GL_STACK_OVERFLOW_KHR 0x0503 #define GL_STACK_UNDERFLOW_KHR 0x0504 -#define GL_DISPLAY_LIST 0x82E7 /* GL_KHR_blend_equation_advanced */ @@ -972,15 +927,6 @@ typedef khronos_ssize_t GLsizeiptr; /* GL_KHR_robustness */ -#define GL_NO_ERROR 0 -#define GL_CONTEXT_ROBUST_ACCESS 0x90F3 -#define GL_LOSE_CONTEXT_ON_RESET 0x8252 -#define GL_GUILTY_CONTEXT_RESET 0x8253 -#define GL_INNOCENT_CONTEXT_RESET 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET 0x8255 -#define GL_RESET_NOTIFICATION_STRATEGY 0x8256 -#define GL_NO_RESET_NOTIFICATION 0x8261 -#define GL_CONTEXT_LOST 0x0507 #define GL_NO_ERROR 0 #define GL_CONTEXT_ROBUST_ACCESS_KHR 0x90F3 #define GL_LOSE_CONTEXT_ON_RESET_KHR 0x8252 @@ -993,9 +939,6 @@ typedef khronos_ssize_t GLsizeiptr; /* GL_KHR_context_flush_control */ -#define GL_CONTEXT_RELEASE_BEHAVIOR 0x82FB -#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC -#define GL_NONE 0 #define GL_CONTEXT_RELEASE_BEHAVIOR_KHR 0x82FB #define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR 0x82FC #define GL_NONE 0 @@ -1386,8 +1329,6 @@ GL_APICALL void GL_APIENTRY GLES2Viewport(GLint, GLint, GLsizei, GLsizei); /* GL_EXT_blend_minmax */ #ifndef GL_EXT_blend_minmax #define GL_EXT_blend_minmax 1 -GL_APICALL void GL_APIENTRY GLES2BlendEquationEXT(GLenum); -#define glBlendEquationEXT GLES2BlendEquationEXT #endif /* GL_EXT_debug_label */ @@ -1551,14 +1492,10 @@ GL_APICALL void GL_APIENTRY GLES2ReadnPixelsEXT(GLint, GLint, GLsizei, GLsizei, /* GL_EXT_separate_shader_objects */ #ifndef GL_EXT_separate_shader_objects #define GL_EXT_separate_shader_objects 1 -GL_APICALL void GL_APIENTRY GLES2ActiveProgramEXT(GLuint); -#define glActiveProgramEXT GLES2ActiveProgramEXT GL_APICALL void GL_APIENTRY GLES2ActiveShaderProgramEXT(GLuint, GLuint); #define glActiveShaderProgramEXT GLES2ActiveShaderProgramEXT GL_APICALL void GL_APIENTRY GLES2BindProgramPipelineEXT(GLuint); #define glBindProgramPipelineEXT GLES2BindProgramPipelineEXT -GL_APICALL GLuint GL_APIENTRY GLES2CreateShaderProgramEXT(GLenum, const GLchar *); -#define glCreateShaderProgramEXT GLES2CreateShaderProgramEXT GL_APICALL GLuint GL_APIENTRY GLES2CreateShaderProgramvEXT(GLenum, GLsizei, const GLchar **); #define glCreateShaderProgramvEXT GLES2CreateShaderProgramvEXT GL_APICALL void GL_APIENTRY GLES2DeleteProgramPipelinesEXT(GLsizei, const GLuint *); @@ -1641,8 +1578,6 @@ GL_APICALL void GL_APIENTRY GLES2ProgramUniformMatrix4x3fvEXT(GLuint, GLint, GLs #define glProgramUniformMatrix4x3fvEXT GLES2ProgramUniformMatrix4x3fvEXT GL_APICALL void GL_APIENTRY GLES2UseProgramStagesEXT(GLuint, GLbitfield, GLuint); #define glUseProgramStagesEXT GLES2UseProgramStagesEXT -GL_APICALL void GL_APIENTRY GLES2UseShaderProgramEXT(GLenum, GLuint); -#define glUseShaderProgramEXT GLES2UseShaderProgramEXT GL_APICALL void GL_APIENTRY GLES2ValidateProgramPipelineEXT(GLuint); #define glValidateProgramPipelineEXT GLES2ValidateProgramPipelineEXT #endif @@ -1740,48 +1675,26 @@ GL_APICALL void GL_APIENTRY GLES2BlendBarrierKHR(void); /* GL_KHR_debug */ #ifndef GL_KHR_debug #define GL_KHR_debug 1 -GL_APICALL void GL_APIENTRY GLES2DebugMessageCallback(GLDEBUGPROC, const void *); -#define glDebugMessageCallback GLES2DebugMessageCallback GL_APICALL void GL_APIENTRY GLES2DebugMessageCallbackKHR(GLDEBUGPROCKHR, const void *); #define glDebugMessageCallbackKHR GLES2DebugMessageCallbackKHR -GL_APICALL void GL_APIENTRY GLES2DebugMessageControl(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean); -#define glDebugMessageControl GLES2DebugMessageControl GL_APICALL void GL_APIENTRY GLES2DebugMessageControlKHR(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean); #define glDebugMessageControlKHR GLES2DebugMessageControlKHR -GL_APICALL void GL_APIENTRY GLES2DebugMessageInsert(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *); -#define glDebugMessageInsert GLES2DebugMessageInsert GL_APICALL void GL_APIENTRY GLES2DebugMessageInsertKHR(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *); #define glDebugMessageInsertKHR GLES2DebugMessageInsertKHR -GL_APICALL GLuint GL_APIENTRY GLES2GetDebugMessageLog(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *); -#define glGetDebugMessageLog GLES2GetDebugMessageLog GL_APICALL GLuint GL_APIENTRY GLES2GetDebugMessageLogKHR(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *); #define glGetDebugMessageLogKHR GLES2GetDebugMessageLogKHR -GL_APICALL void GL_APIENTRY GLES2GetObjectLabel(GLenum, GLuint, GLsizei, GLsizei *, GLchar *); -#define glGetObjectLabel GLES2GetObjectLabel GL_APICALL void GL_APIENTRY GLES2GetObjectLabelKHR(GLenum, GLuint, GLsizei, GLsizei *, GLchar *); #define glGetObjectLabelKHR GLES2GetObjectLabelKHR -GL_APICALL void GL_APIENTRY GLES2GetObjectPtrLabel(const void *, GLsizei, GLsizei *, GLchar *); -#define glGetObjectPtrLabel GLES2GetObjectPtrLabel GL_APICALL void GL_APIENTRY GLES2GetObjectPtrLabelKHR(const void *, GLsizei, GLsizei *, GLchar *); #define glGetObjectPtrLabelKHR GLES2GetObjectPtrLabelKHR -GL_APICALL void GL_APIENTRY GLES2GetPointerv(GLenum, void **); -#define glGetPointerv GLES2GetPointerv GL_APICALL void GL_APIENTRY GLES2GetPointervKHR(GLenum, void **); #define glGetPointervKHR GLES2GetPointervKHR -GL_APICALL void GL_APIENTRY GLES2ObjectLabel(GLenum, GLuint, GLsizei, const GLchar *); -#define glObjectLabel GLES2ObjectLabel GL_APICALL void GL_APIENTRY GLES2ObjectLabelKHR(GLenum, GLuint, GLsizei, const GLchar *); #define glObjectLabelKHR GLES2ObjectLabelKHR -GL_APICALL void GL_APIENTRY GLES2ObjectPtrLabel(const void *, GLsizei, const GLchar *); -#define glObjectPtrLabel GLES2ObjectPtrLabel GL_APICALL void GL_APIENTRY GLES2ObjectPtrLabelKHR(const void *, GLsizei, const GLchar *); #define glObjectPtrLabelKHR GLES2ObjectPtrLabelKHR -GL_APICALL void GL_APIENTRY GLES2PopDebugGroup(void); -#define glPopDebugGroup GLES2PopDebugGroup GL_APICALL void GL_APIENTRY GLES2PopDebugGroupKHR(void); #define glPopDebugGroupKHR GLES2PopDebugGroupKHR -GL_APICALL void GL_APIENTRY GLES2PushDebugGroup(GLenum, GLuint, GLsizei, const GLchar *); -#define glPushDebugGroup GLES2PushDebugGroup GL_APICALL void GL_APIENTRY GLES2PushDebugGroupKHR(GLenum, GLuint, GLsizei, const GLchar *); #define glPushDebugGroupKHR GLES2PushDebugGroupKHR #endif @@ -1794,24 +1707,14 @@ GL_APICALL void GL_APIENTRY GLES2PushDebugGroupKHR(GLenum, GLuint, GLsizei, cons /* GL_KHR_robustness */ #ifndef GL_KHR_robustness #define GL_KHR_robustness 1 -GL_APICALL GLenum GL_APIENTRY GLES2GetGraphicsResetStatus(void); -#define glGetGraphicsResetStatus GLES2GetGraphicsResetStatus GL_APICALL GLenum GL_APIENTRY GLES2GetGraphicsResetStatusKHR(void); #define glGetGraphicsResetStatusKHR GLES2GetGraphicsResetStatusKHR -GL_APICALL void GL_APIENTRY GLES2GetnUniformfv(GLuint, GLint, GLsizei, GLfloat *); -#define glGetnUniformfv GLES2GetnUniformfv GL_APICALL void GL_APIENTRY GLES2GetnUniformfvKHR(GLuint, GLint, GLsizei, GLfloat *); #define glGetnUniformfvKHR GLES2GetnUniformfvKHR -GL_APICALL void GL_APIENTRY GLES2GetnUniformiv(GLuint, GLint, GLsizei, GLint *); -#define glGetnUniformiv GLES2GetnUniformiv GL_APICALL void GL_APIENTRY GLES2GetnUniformivKHR(GLuint, GLint, GLsizei, GLint *); #define glGetnUniformivKHR GLES2GetnUniformivKHR -GL_APICALL void GL_APIENTRY GLES2GetnUniformuiv(GLuint, GLint, GLsizei, GLuint *); -#define glGetnUniformuiv GLES2GetnUniformuiv GL_APICALL void GL_APIENTRY GLES2GetnUniformuivKHR(GLuint, GLint, GLsizei, GLuint *); #define glGetnUniformuivKHR GLES2GetnUniformuivKHR -GL_APICALL void GL_APIENTRY GLES2ReadnPixels(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *); -#define glReadnPixels GLES2ReadnPixels GL_APICALL void GL_APIENTRY GLES2ReadnPixelsKHR(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *); #define glReadnPixelsKHR GLES2ReadnPixelsKHR #endif diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp b/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp index 36fdd73da..3a5273cc8 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp +++ b/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp @@ -32,7 +32,6 @@ void flextGLInit() { /* GL_ARM_rgba8 */ /* GL_EXT_blend_minmax */ - flextglBlendEquationEXT = reinterpret_cast(loader.load("glBlendEquationEXT")); /* GL_EXT_debug_label */ flextglGetObjectLabelEXT = reinterpret_cast(loader.load("glGetObjectLabelEXT")); @@ -106,10 +105,8 @@ void flextGLInit() { /* GL_EXT_sRGB_write_control */ /* GL_EXT_separate_shader_objects */ - flextglActiveProgramEXT = reinterpret_cast(loader.load("glActiveProgramEXT")); flextglActiveShaderProgramEXT = reinterpret_cast(loader.load("glActiveShaderProgramEXT")); flextglBindProgramPipelineEXT = reinterpret_cast(loader.load("glBindProgramPipelineEXT")); - flextglCreateShaderProgramEXT = reinterpret_cast(loader.load("glCreateShaderProgramEXT")); flextglCreateShaderProgramvEXT = reinterpret_cast(loader.load("glCreateShaderProgramvEXT")); flextglDeleteProgramPipelinesEXT = reinterpret_cast(loader.load("glDeleteProgramPipelinesEXT")); flextglGenProgramPipelinesEXT = reinterpret_cast(loader.load("glGenProgramPipelinesEXT")); @@ -151,7 +148,6 @@ void flextGLInit() { flextglProgramUniformMatrix4x2fvEXT = reinterpret_cast(loader.load("glProgramUniformMatrix4x2fvEXT")); flextglProgramUniformMatrix4x3fvEXT = reinterpret_cast(loader.load("glProgramUniformMatrix4x3fvEXT")); flextglUseProgramStagesEXT = reinterpret_cast(loader.load("glUseProgramStagesEXT")); - flextglUseShaderProgramEXT = reinterpret_cast(loader.load("glUseShaderProgramEXT")); flextglValidateProgramPipelineEXT = reinterpret_cast(loader.load("glValidateProgramPipelineEXT")); /* GL_EXT_shader_texture_lod */ @@ -194,41 +190,25 @@ void flextGLInit() { /* GL_KHR_context_flush_control */ /* GL_KHR_debug */ - flextglDebugMessageCallback = reinterpret_cast(loader.load("glDebugMessageCallback")); flextglDebugMessageCallbackKHR = reinterpret_cast(loader.load("glDebugMessageCallbackKHR")); - flextglDebugMessageControl = reinterpret_cast(loader.load("glDebugMessageControl")); flextglDebugMessageControlKHR = reinterpret_cast(loader.load("glDebugMessageControlKHR")); - flextglDebugMessageInsert = reinterpret_cast(loader.load("glDebugMessageInsert")); flextglDebugMessageInsertKHR = reinterpret_cast(loader.load("glDebugMessageInsertKHR")); - flextglGetDebugMessageLog = reinterpret_cast(loader.load("glGetDebugMessageLog")); flextglGetDebugMessageLogKHR = reinterpret_cast(loader.load("glGetDebugMessageLogKHR")); - flextglGetObjectLabel = reinterpret_cast(loader.load("glGetObjectLabel")); flextglGetObjectLabelKHR = reinterpret_cast(loader.load("glGetObjectLabelKHR")); - flextglGetObjectPtrLabel = reinterpret_cast(loader.load("glGetObjectPtrLabel")); flextglGetObjectPtrLabelKHR = reinterpret_cast(loader.load("glGetObjectPtrLabelKHR")); - flextglGetPointerv = reinterpret_cast(loader.load("glGetPointerv")); flextglGetPointervKHR = reinterpret_cast(loader.load("glGetPointervKHR")); - flextglObjectLabel = reinterpret_cast(loader.load("glObjectLabel")); flextglObjectLabelKHR = reinterpret_cast(loader.load("glObjectLabelKHR")); - flextglObjectPtrLabel = reinterpret_cast(loader.load("glObjectPtrLabel")); flextglObjectPtrLabelKHR = reinterpret_cast(loader.load("glObjectPtrLabelKHR")); - flextglPopDebugGroup = reinterpret_cast(loader.load("glPopDebugGroup")); flextglPopDebugGroupKHR = reinterpret_cast(loader.load("glPopDebugGroupKHR")); - flextglPushDebugGroup = reinterpret_cast(loader.load("glPushDebugGroup")); flextglPushDebugGroupKHR = reinterpret_cast(loader.load("glPushDebugGroupKHR")); /* GL_KHR_robust_buffer_access_behavior */ /* GL_KHR_robustness */ - flextglGetGraphicsResetStatus = reinterpret_cast(loader.load("glGetGraphicsResetStatus")); flextglGetGraphicsResetStatusKHR = reinterpret_cast(loader.load("glGetGraphicsResetStatusKHR")); - flextglGetnUniformfv = reinterpret_cast(loader.load("glGetnUniformfv")); flextglGetnUniformfvKHR = reinterpret_cast(loader.load("glGetnUniformfvKHR")); - flextglGetnUniformiv = reinterpret_cast(loader.load("glGetnUniformiv")); flextglGetnUniformivKHR = reinterpret_cast(loader.load("glGetnUniformivKHR")); - flextglGetnUniformuiv = reinterpret_cast(loader.load("glGetnUniformuiv")); flextglGetnUniformuivKHR = reinterpret_cast(loader.load("glGetnUniformuivKHR")); - flextglReadnPixels = reinterpret_cast(loader.load("glReadnPixels")); flextglReadnPixelsKHR = reinterpret_cast(loader.load("glReadnPixelsKHR")); /* GL_KHR_texture_compression_astc_hdr */ diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.cpp b/src/MagnumExternal/OpenGL/GLES3/flextGL.cpp index 408457792..aa1a86be5 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.cpp +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.cpp @@ -130,10 +130,8 @@ FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformivEXT)(GLuint, GLint, GLsizei, G FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsEXT)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *) = nullptr; /* GL_EXT_separate_shader_objects */ -FLEXTGL_EXPORT void(APIENTRY *flextglActiveProgramEXT)(GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglActiveShaderProgramEXT)(GLuint, GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglBindProgramPipelineEXT)(GLuint) = nullptr; -FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateShaderProgramEXT)(GLenum, const GLchar *) = nullptr; FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateShaderProgramvEXT)(GLenum, GLsizei, const GLchar **) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglDeleteProgramPipelinesEXT)(GLsizei, const GLuint *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGenProgramPipelinesEXT)(GLsizei, GLuint *) = nullptr; @@ -175,7 +173,6 @@ FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4fvEXT)(GLuint, GLint, FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x2fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x3fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglUseProgramStagesEXT)(GLuint, GLbitfield, GLuint) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglUseShaderProgramEXT)(GLenum, GLuint) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglValidateProgramPipelineEXT)(GLuint) = nullptr; /* GL_EXT_tessellation_shader */ @@ -199,39 +196,23 @@ FLEXTGL_EXPORT void(APIENTRY *flextglTexBufferRangeEXT)(GLenum, GLenum, GLuint, FLEXTGL_EXPORT void(APIENTRY *flextglBlendBarrierKHR)(void) = nullptr; /* GL_KHR_debug */ -FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageCallback)(GLDEBUGPROC, const void *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageCallbackKHR)(GLDEBUGPROCKHR, const void *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageControl)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageControlKHR)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageInsert)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageInsertKHR)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *) = nullptr; -FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetDebugMessageLog)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *) = nullptr; FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetDebugMessageLogKHR)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabel)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabelKHR)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectPtrLabel)(const void *, GLsizei, GLsizei *, GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectPtrLabelKHR)(const void *, GLsizei, GLsizei *, GLchar *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetPointerv)(GLenum, void **) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetPointervKHR)(GLenum, void **) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabel)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabelKHR)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabel)(const void *, GLsizei, const GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabelKHR)(const void *, GLsizei, const GLchar *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroup)(void) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroupKHR)(void) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroup)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroupKHR)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr; /* GL_KHR_robustness */ -FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatus)(void) = nullptr; FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusKHR)(void) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformfv)(GLuint, GLint, GLsizei, GLfloat *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformfvKHR)(GLuint, GLint, GLsizei, GLfloat *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformiv)(GLuint, GLint, GLsizei, GLint *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformivKHR)(GLuint, GLint, GLsizei, GLint *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformuiv)(GLuint, GLint, GLsizei, GLuint *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformuivKHR)(GLuint, GLint, GLsizei, GLuint *) = nullptr; -FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixels)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *) = nullptr; FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsKHR)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *) = nullptr; /* GL_NV_polygon_mode */ diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h b/src/MagnumExternal/OpenGL/GLES3/flextGL.h index e2b613bc5..4e9a8bf3d 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h @@ -74,7 +74,6 @@ typedef int GLsizei; typedef char GLchar; typedef unsigned short GLhalf; typedef struct __GLsync *GLsync; -typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); typedef khronos_int8_t GLbyte; typedef khronos_uint8_t GLubyte; @@ -1104,7 +1103,6 @@ typedef khronos_ssize_t GLsizeiptr; /* GL_EXT_separate_shader_objects */ -#define GL_ACTIVE_PROGRAM_EXT 0x8259 #define GL_VERTEX_SHADER_BIT_EXT 0x00000001 #define GL_FRAGMENT_SHADER_BIT_EXT 0x00000002 #define GL_ALL_SHADER_BITS_EXT 0xFFFFFFFF @@ -1194,46 +1192,6 @@ typedef khronos_ssize_t GLsizeiptr; /* GL_KHR_debug */ -#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 -#define GL_DEBUG_SOURCE_API 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION 0x824A -#define GL_DEBUG_SOURCE_OTHER 0x824B -#define GL_DEBUG_TYPE_ERROR 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E -#define GL_DEBUG_TYPE_PORTABILITY 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 -#define GL_DEBUG_TYPE_OTHER 0x8251 -#define GL_DEBUG_TYPE_MARKER 0x8268 -#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 -#define GL_DEBUG_TYPE_POP_GROUP 0x826A -#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B -#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C -#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D -#define GL_BUFFER 0x82E0 -#define GL_SHADER 0x82E1 -#define GL_PROGRAM 0x82E2 -#define GL_VERTEX_ARRAY 0x8074 -#define GL_QUERY 0x82E3 -#define GL_PROGRAM_PIPELINE 0x82E4 -#define GL_SAMPLER 0x82E6 -#define GL_MAX_LABEL_LENGTH 0x82E8 -#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES 0x9145 -#define GL_DEBUG_SEVERITY_HIGH 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 -#define GL_DEBUG_SEVERITY_LOW 0x9148 -#define GL_DEBUG_OUTPUT 0x92E0 -#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 -#define GL_STACK_OVERFLOW 0x0503 -#define GL_STACK_UNDERFLOW 0x0504 #define GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR 0x8242 #define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR 0x8243 #define GL_DEBUG_CALLBACK_FUNCTION_KHR 0x8244 @@ -1274,7 +1232,6 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_CONTEXT_FLAG_DEBUG_BIT_KHR 0x00000002 #define GL_STACK_OVERFLOW_KHR 0x0503 #define GL_STACK_UNDERFLOW_KHR 0x0504 -#define GL_DISPLAY_LIST 0x82E7 /* GL_KHR_blend_equation_advanced */ @@ -1300,15 +1257,6 @@ typedef khronos_ssize_t GLsizeiptr; /* GL_KHR_robustness */ -#define GL_NO_ERROR 0 -#define GL_CONTEXT_ROBUST_ACCESS 0x90F3 -#define GL_LOSE_CONTEXT_ON_RESET 0x8252 -#define GL_GUILTY_CONTEXT_RESET 0x8253 -#define GL_INNOCENT_CONTEXT_RESET 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET 0x8255 -#define GL_RESET_NOTIFICATION_STRATEGY 0x8256 -#define GL_NO_RESET_NOTIFICATION 0x8261 -#define GL_CONTEXT_LOST 0x0507 #define GL_NO_ERROR 0 #define GL_CONTEXT_ROBUST_ACCESS_KHR 0x90F3 #define GL_LOSE_CONTEXT_ON_RESET_KHR 0x8252 @@ -1321,9 +1269,6 @@ typedef khronos_ssize_t GLsizeiptr; /* GL_KHR_context_flush_control */ -#define GL_CONTEXT_RELEASE_BEHAVIOR 0x82FB -#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC -#define GL_NONE 0 #define GL_CONTEXT_RELEASE_BEHAVIOR_KHR 0x82FB #define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR 0x82FC #define GL_NONE 0 @@ -1895,14 +1840,10 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsEXT)(GLint, GLint, GLsizei /* GL_EXT_separate_shader_objects */ -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglActiveProgramEXT)(GLuint); -#define glActiveProgramEXT flextglActiveProgramEXT GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglActiveShaderProgramEXT)(GLuint, GLuint); #define glActiveShaderProgramEXT flextglActiveShaderProgramEXT GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglBindProgramPipelineEXT)(GLuint); #define glBindProgramPipelineEXT flextglBindProgramPipelineEXT -GLAPI FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateShaderProgramEXT)(GLenum, const GLchar *); -#define glCreateShaderProgramEXT flextglCreateShaderProgramEXT GLAPI FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateShaderProgramvEXT)(GLenum, GLsizei, const GLchar **); #define glCreateShaderProgramvEXT flextglCreateShaderProgramvEXT GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDeleteProgramPipelinesEXT)(GLsizei, const GLuint *); @@ -1985,8 +1926,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x3fvEXT)(GLuint, #define glProgramUniformMatrix4x3fvEXT flextglProgramUniformMatrix4x3fvEXT GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglUseProgramStagesEXT)(GLuint, GLbitfield, GLuint); #define glUseProgramStagesEXT flextglUseProgramStagesEXT -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglUseShaderProgramEXT)(GLenum, GLuint); -#define glUseShaderProgramEXT flextglUseShaderProgramEXT GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglValidateProgramPipelineEXT)(GLuint); #define glValidateProgramPipelineEXT flextglValidateProgramPipelineEXT @@ -2052,48 +1991,26 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglBlendBarrierKHR)(void); /* GL_KHR_debug */ -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageCallback)(GLDEBUGPROC, const void *); -#define glDebugMessageCallback flextglDebugMessageCallback GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageCallbackKHR)(GLDEBUGPROCKHR, const void *); #define glDebugMessageCallbackKHR flextglDebugMessageCallbackKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageControl)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean); -#define glDebugMessageControl flextglDebugMessageControl GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageControlKHR)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean); #define glDebugMessageControlKHR flextglDebugMessageControlKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageInsert)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *); -#define glDebugMessageInsert flextglDebugMessageInsert GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageInsertKHR)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *); #define glDebugMessageInsertKHR flextglDebugMessageInsertKHR -GLAPI FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetDebugMessageLog)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *); -#define glGetDebugMessageLog flextglGetDebugMessageLog GLAPI FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetDebugMessageLogKHR)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *); #define glGetDebugMessageLogKHR flextglGetDebugMessageLogKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabel)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *); -#define glGetObjectLabel flextglGetObjectLabel GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabelKHR)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *); #define glGetObjectLabelKHR flextglGetObjectLabelKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectPtrLabel)(const void *, GLsizei, GLsizei *, GLchar *); -#define glGetObjectPtrLabel flextglGetObjectPtrLabel GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectPtrLabelKHR)(const void *, GLsizei, GLsizei *, GLchar *); #define glGetObjectPtrLabelKHR flextglGetObjectPtrLabelKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetPointerv)(GLenum, void **); -#define glGetPointerv flextglGetPointerv GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetPointervKHR)(GLenum, void **); #define glGetPointervKHR flextglGetPointervKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabel)(GLenum, GLuint, GLsizei, const GLchar *); -#define glObjectLabel flextglObjectLabel GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabelKHR)(GLenum, GLuint, GLsizei, const GLchar *); #define glObjectLabelKHR flextglObjectLabelKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabel)(const void *, GLsizei, const GLchar *); -#define glObjectPtrLabel flextglObjectPtrLabel GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabelKHR)(const void *, GLsizei, const GLchar *); #define glObjectPtrLabelKHR flextglObjectPtrLabelKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroup)(void); -#define glPopDebugGroup flextglPopDebugGroup GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroupKHR)(void); #define glPopDebugGroupKHR flextglPopDebugGroupKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroup)(GLenum, GLuint, GLsizei, const GLchar *); -#define glPushDebugGroup flextglPushDebugGroup GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroupKHR)(GLenum, GLuint, GLsizei, const GLchar *); #define glPushDebugGroupKHR flextglPushDebugGroupKHR @@ -2102,24 +2019,14 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroupKHR)(GLenum, GLuint, GL /* GL_KHR_robustness */ -GLAPI FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatus)(void); -#define glGetGraphicsResetStatus flextglGetGraphicsResetStatus GLAPI FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusKHR)(void); #define glGetGraphicsResetStatusKHR flextglGetGraphicsResetStatusKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformfv)(GLuint, GLint, GLsizei, GLfloat *); -#define glGetnUniformfv flextglGetnUniformfv GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformfvKHR)(GLuint, GLint, GLsizei, GLfloat *); #define glGetnUniformfvKHR flextglGetnUniformfvKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformiv)(GLuint, GLint, GLsizei, GLint *); -#define glGetnUniformiv flextglGetnUniformiv GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformivKHR)(GLuint, GLint, GLsizei, GLint *); #define glGetnUniformivKHR flextglGetnUniformivKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformuiv)(GLuint, GLint, GLsizei, GLuint *); -#define glGetnUniformuiv flextglGetnUniformuiv GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformuivKHR)(GLuint, GLint, GLsizei, GLuint *); #define glGetnUniformuivKHR flextglGetnUniformuivKHR -GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixels)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *); -#define glReadnPixels flextglReadnPixels GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsKHR)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *); #define glReadnPixelsKHR flextglReadnPixelsKHR diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp index 3e2e54f3f..1ece6626c 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp @@ -144,10 +144,8 @@ void flextGLInit() { /* GL_EXT_sRGB_write_control */ /* GL_EXT_separate_shader_objects */ - flextglActiveProgramEXT = reinterpret_cast(loader.load("glActiveProgramEXT")); flextglActiveShaderProgramEXT = reinterpret_cast(loader.load("glActiveShaderProgramEXT")); flextglBindProgramPipelineEXT = reinterpret_cast(loader.load("glBindProgramPipelineEXT")); - flextglCreateShaderProgramEXT = reinterpret_cast(loader.load("glCreateShaderProgramEXT")); flextglCreateShaderProgramvEXT = reinterpret_cast(loader.load("glCreateShaderProgramvEXT")); flextglDeleteProgramPipelinesEXT = reinterpret_cast(loader.load("glDeleteProgramPipelinesEXT")); flextglGenProgramPipelinesEXT = reinterpret_cast(loader.load("glGenProgramPipelinesEXT")); @@ -189,7 +187,6 @@ void flextGLInit() { flextglProgramUniformMatrix4x2fvEXT = reinterpret_cast(loader.load("glProgramUniformMatrix4x2fvEXT")); flextglProgramUniformMatrix4x3fvEXT = reinterpret_cast(loader.load("glProgramUniformMatrix4x3fvEXT")); flextglUseProgramStagesEXT = reinterpret_cast(loader.load("glUseProgramStagesEXT")); - flextglUseShaderProgramEXT = reinterpret_cast(loader.load("glUseShaderProgramEXT")); flextglValidateProgramPipelineEXT = reinterpret_cast(loader.load("glValidateProgramPipelineEXT")); /* GL_EXT_shader_integer_mix */ @@ -229,41 +226,25 @@ void flextGLInit() { /* GL_KHR_context_flush_control */ /* GL_KHR_debug */ - flextglDebugMessageCallback = reinterpret_cast(loader.load("glDebugMessageCallback")); flextglDebugMessageCallbackKHR = reinterpret_cast(loader.load("glDebugMessageCallbackKHR")); - flextglDebugMessageControl = reinterpret_cast(loader.load("glDebugMessageControl")); flextglDebugMessageControlKHR = reinterpret_cast(loader.load("glDebugMessageControlKHR")); - flextglDebugMessageInsert = reinterpret_cast(loader.load("glDebugMessageInsert")); flextglDebugMessageInsertKHR = reinterpret_cast(loader.load("glDebugMessageInsertKHR")); - flextglGetDebugMessageLog = reinterpret_cast(loader.load("glGetDebugMessageLog")); flextglGetDebugMessageLogKHR = reinterpret_cast(loader.load("glGetDebugMessageLogKHR")); - flextglGetObjectLabel = reinterpret_cast(loader.load("glGetObjectLabel")); flextglGetObjectLabelKHR = reinterpret_cast(loader.load("glGetObjectLabelKHR")); - flextglGetObjectPtrLabel = reinterpret_cast(loader.load("glGetObjectPtrLabel")); flextglGetObjectPtrLabelKHR = reinterpret_cast(loader.load("glGetObjectPtrLabelKHR")); - flextglGetPointerv = reinterpret_cast(loader.load("glGetPointerv")); flextglGetPointervKHR = reinterpret_cast(loader.load("glGetPointervKHR")); - flextglObjectLabel = reinterpret_cast(loader.load("glObjectLabel")); flextglObjectLabelKHR = reinterpret_cast(loader.load("glObjectLabelKHR")); - flextglObjectPtrLabel = reinterpret_cast(loader.load("glObjectPtrLabel")); flextglObjectPtrLabelKHR = reinterpret_cast(loader.load("glObjectPtrLabelKHR")); - flextglPopDebugGroup = reinterpret_cast(loader.load("glPopDebugGroup")); flextglPopDebugGroupKHR = reinterpret_cast(loader.load("glPopDebugGroupKHR")); - flextglPushDebugGroup = reinterpret_cast(loader.load("glPushDebugGroup")); flextglPushDebugGroupKHR = reinterpret_cast(loader.load("glPushDebugGroupKHR")); /* GL_KHR_robust_buffer_access_behavior */ /* GL_KHR_robustness */ - flextglGetGraphicsResetStatus = reinterpret_cast(loader.load("glGetGraphicsResetStatus")); flextglGetGraphicsResetStatusKHR = reinterpret_cast(loader.load("glGetGraphicsResetStatusKHR")); - flextglGetnUniformfv = reinterpret_cast(loader.load("glGetnUniformfv")); flextglGetnUniformfvKHR = reinterpret_cast(loader.load("glGetnUniformfvKHR")); - flextglGetnUniformiv = reinterpret_cast(loader.load("glGetnUniformiv")); flextglGetnUniformivKHR = reinterpret_cast(loader.load("glGetnUniformivKHR")); - flextglGetnUniformuiv = reinterpret_cast(loader.load("glGetnUniformuiv")); flextglGetnUniformuivKHR = reinterpret_cast(loader.load("glGetnUniformuivKHR")); - flextglReadnPixels = reinterpret_cast(loader.load("glReadnPixels")); flextglReadnPixelsKHR = reinterpret_cast(loader.load("glReadnPixelsKHR")); /* GL_KHR_texture_compression_astc_hdr */