From 32e56b8a14af3edd0f340709e9c1f1d5607d48fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 2 Aug 2015 14:01:10 +0200 Subject: [PATCH] external: shorter generated GL loader files. I like commits like this. --- src/MagnumExternal/OpenGL/GL/flextGL.h | 51 ------- .../OpenGL/GL/flextGL.h.template | 2 + .../OpenGL/GL/flextGLPlatform.cpp | 34 ----- .../OpenGL/GL/flextGLPlatform.cpp.template | 2 +- .../Emscripten/flextGLEmscripten.h.template | 2 + .../OpenGL/GLES2/flextGL.cpp.template | 2 +- src/MagnumExternal/OpenGL/GLES2/flextGL.h | 144 ------------------ .../OpenGL/GLES2/flextGL.h.template | 2 + .../OpenGL/GLES2/flextGLEmscripten.h | 36 ----- .../OpenGL/GLES2/flextGLPlatform.cpp | 96 ------------ .../OpenGL/GLES2/flextGLPlatform.cpp.template | 2 +- .../Emscripten/flextGLEmscripten.h.template | 2 + .../OpenGL/GLES3/flextGL.cpp.template | 2 +- src/MagnumExternal/OpenGL/GLES3/flextGL.h | 90 ----------- .../OpenGL/GLES3/flextGL.h.template | 2 + .../OpenGL/GLES3/flextGLEmscripten.h | 6 - .../OpenGL/GLES3/flextGLPlatform.cpp | 60 -------- .../OpenGL/GLES3/flextGLPlatform.cpp.template | 2 +- 18 files changed, 15 insertions(+), 522 deletions(-) diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h b/src/MagnumExternal/OpenGL/GL/flextGL.h index 3b81f2b94..8771bddfd 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.h +++ b/src/MagnumExternal/OpenGL/GL/flextGL.h @@ -1751,12 +1751,6 @@ typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum /* Function prototypes */ -/* GL_AMD_shader_trinary_minmax */ - - -/* GL_AMD_vertex_shader_layer */ - - /* GL_ARB_bindless_texture */ GLAPI FLEXTGL_EXPORT GLuint64(APIENTRY *flextglGetImageHandleARB)(GLuint, GLint, GLboolean, GLint, GLenum); @@ -1804,9 +1798,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawArraysIndirectCountARB)(GLen GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawElementsIndirectCountARB)(GLenum, GLenum, GLintptr, GLintptr, GLsizei, GLsizei); #define glMultiDrawElementsIndirectCountARB flextglMultiDrawElementsIndirectCountARB -/* GL_ARB_pipeline_statistics_query */ - - /* GL_ARB_robustness */ GLAPI FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusARB)(void); @@ -1826,18 +1817,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformuivARB)(GLuint, GLint, GLs GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsARB)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *); #define glReadnPixelsARB flextglReadnPixelsARB -/* GL_ARB_robustness_isolation */ - - -/* GL_ARB_seamless_cubemap_per_texture */ - - -/* GL_ARB_shader_draw_parameters */ - - -/* GL_ARB_shader_group_vote */ - - /* GL_ARB_sparse_buffer */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglBufferPageCommitmentARB)(GLenum, GLintptr, GLsizeiptr, GLboolean); @@ -1852,12 +1831,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglNamedBufferPageCommitmentEXT)(GLuint, GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglTexPageCommitmentARB)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLboolean); #define glTexPageCommitmentARB flextglTexPageCommitmentARB -/* GL_ARB_transform_feedback_overflow_query */ - - -/* GL_ATI_texture_mirror_once */ - - /* GL_EXT_debug_label */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabelEXT)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *); @@ -2387,21 +2360,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglVertexArrayVertexBindingDivisorEXT)(G GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglVertexArrayVertexOffsetEXT)(GLuint, GLuint, GLint, GLenum, GLsizei, GLintptr); #define glVertexArrayVertexOffsetEXT flextglVertexArrayVertexOffsetEXT -/* GL_EXT_shader_integer_mix */ - - -/* GL_EXT_texture_compression_s3tc */ - - -/* GL_EXT_texture_filter_anisotropic */ - - -/* GL_EXT_texture_mirror_clamp */ - - -/* GL_EXT_texture_sRGB_decode */ - - /* GL_GREMEDY_string_marker */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglStringMarkerGREMEDY)(GLsizei, const void *); @@ -2412,15 +2370,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglStringMarkerGREMEDY)(GLsizei, const v GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglBlendBarrierKHR)(void); #define glBlendBarrierKHR flextglBlendBarrierKHR -/* GL_KHR_blend_equation_advanced_coherent */ - - -/* GL_KHR_texture_compression_astc_hdr */ - - -/* GL_KHR_texture_compression_astc_ldr */ - - /* GL_VERSION_1_0 */ GLAPI FLEXTGL_EXPORT void APIENTRY glBlendFunc(GLenum, GLenum); diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h.template b/src/MagnumExternal/OpenGL/GL/flextGL.h.template index 539e1a896..d0d36d364 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.h.template +++ b/src/MagnumExternal/OpenGL/GL/flextGL.h.template @@ -76,6 +76,7 @@ void flextGLInit(); /* Function prototypes */ @for cat,funcs in functions: +@if funcs: /* GL_@cat */ @@ -92,6 +93,7 @@ GLAPI FLEXTGL_EXPORT @f.returntype\ @end @end @end +@end #ifdef __cplusplus } diff --git a/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp b/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp index 99577b055..49c91d3a9 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp +++ b/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp @@ -8,10 +8,6 @@ void flextGLInit() { Magnum::Platform::Implementation::OpenGLFunctionLoader loader; - /* GL_AMD_shader_trinary_minmax */ - - /* GL_AMD_vertex_shader_layer */ - /* GL_ARB_bindless_texture */ flextglGetImageHandleARB = reinterpret_cast(loader.load("glGetImageHandleARB")); flextglGetTextureHandleARB = reinterpret_cast(loader.load("glGetTextureHandleARB")); @@ -37,8 +33,6 @@ void flextGLInit() { flextglMultiDrawArraysIndirectCountARB = reinterpret_cast(loader.load("glMultiDrawArraysIndirectCountARB")); flextglMultiDrawElementsIndirectCountARB = reinterpret_cast(loader.load("glMultiDrawElementsIndirectCountARB")); - /* GL_ARB_pipeline_statistics_query */ - /* GL_ARB_robustness */ flextglGetGraphicsResetStatusARB = reinterpret_cast(loader.load("glGetGraphicsResetStatusARB")); flextglGetnCompressedTexImageARB = reinterpret_cast(loader.load("glGetnCompressedTexImageARB")); @@ -49,14 +43,6 @@ void flextGLInit() { flextglGetnUniformuivARB = reinterpret_cast(loader.load("glGetnUniformuivARB")); flextglReadnPixelsARB = reinterpret_cast(loader.load("glReadnPixelsARB")); - /* GL_ARB_robustness_isolation */ - - /* GL_ARB_seamless_cubemap_per_texture */ - - /* GL_ARB_shader_draw_parameters */ - - /* GL_ARB_shader_group_vote */ - /* GL_ARB_sparse_buffer */ flextglBufferPageCommitmentARB = reinterpret_cast(loader.load("glBufferPageCommitmentARB")); flextglNamedBufferPageCommitmentARB = reinterpret_cast(loader.load("glNamedBufferPageCommitmentARB")); @@ -65,10 +51,6 @@ void flextGLInit() { /* GL_ARB_sparse_texture */ flextglTexPageCommitmentARB = reinterpret_cast(loader.load("glTexPageCommitmentARB")); - /* GL_ARB_transform_feedback_overflow_query */ - - /* GL_ATI_texture_mirror_once */ - /* GL_EXT_debug_label */ flextglGetObjectLabelEXT = reinterpret_cast(loader.load("glGetObjectLabelEXT")); flextglLabelObjectEXT = reinterpret_cast(loader.load("glLabelObjectEXT")); @@ -335,28 +317,12 @@ void flextGLInit() { flextglVertexArrayVertexBindingDivisorEXT = reinterpret_cast(loader.load("glVertexArrayVertexBindingDivisorEXT")); flextglVertexArrayVertexOffsetEXT = reinterpret_cast(loader.load("glVertexArrayVertexOffsetEXT")); - /* GL_EXT_shader_integer_mix */ - - /* GL_EXT_texture_compression_s3tc */ - - /* GL_EXT_texture_filter_anisotropic */ - - /* GL_EXT_texture_mirror_clamp */ - - /* GL_EXT_texture_sRGB_decode */ - /* GL_GREMEDY_string_marker */ flextglStringMarkerGREMEDY = reinterpret_cast(loader.load("glStringMarkerGREMEDY")); /* GL_KHR_blend_equation_advanced */ flextglBlendBarrierKHR = reinterpret_cast(loader.load("glBlendBarrierKHR")); - /* GL_KHR_blend_equation_advanced_coherent */ - - /* GL_KHR_texture_compression_astc_hdr */ - - /* GL_KHR_texture_compression_astc_ldr */ - /* GL_VERSION_1_2 */ flextglCopyTexSubImage3D = reinterpret_cast(loader.load("glCopyTexSubImage3D")); flextglDrawRangeElements = reinterpret_cast(loader.load("glDrawRangeElements")); diff --git a/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp.template b/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp.template index 58a6a4afc..d610b2d72 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp.template +++ b/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp.template @@ -9,7 +9,7 @@ void flextGLInit() { Magnum::Platform::Implementation::OpenGLFunctionLoader loader; @for category,funcs in functions: - @if category not in ['VERSION_1_0', 'VERSION_1_1']: + @if funcs and category not in ['VERSION_1_0', 'VERSION_1_1']: /* GL_@category */ @for f in funcs: diff --git a/src/MagnumExternal/OpenGL/GLES2/Emscripten/flextGLEmscripten.h.template b/src/MagnumExternal/OpenGL/GLES2/Emscripten/flextGLEmscripten.h.template index ef6af8275..b95c7a739 100644 --- a/src/MagnumExternal/OpenGL/GLES2/Emscripten/flextGLEmscripten.h.template +++ b/src/MagnumExternal/OpenGL/GLES2/Emscripten/flextGLEmscripten.h.template @@ -40,6 +40,7 @@ void flextGLInit(); /* Function prototypes */ @for cat,funcs in functions: +@if funcs: /* GL_@cat */ @@ -48,6 +49,7 @@ GLAPI @f.returntype gl@f.name\ (@f.param_type_list_string()); @end @end +@end #ifdef __cplusplus } diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGL.cpp.template b/src/MagnumExternal/OpenGL/GLES2/flextGL.cpp.template index 953aae2fd..e8fe4be3a 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGL.cpp.template +++ b/src/MagnumExternal/OpenGL/GLES2/flextGL.cpp.template @@ -5,7 +5,7 @@ extern "C" { #endif @for category,funcs in functions: -@if len(funcs) > 0 and category not in ['ES_VERSION_2_0']: +@if funcs and category not in ['ES_VERSION_2_0']: /* GL_@category */ @for f in funcs: diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGL.h b/src/MagnumExternal/OpenGL/GLES2/flextGL.h index 3bac0ec23..08f63607d 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES2/flextGL.h @@ -1015,9 +1015,6 @@ typedef khronos_ssize_t GLsizeiptr; /* Function prototypes */ -/* GL_ANGLE_depth_texture */ - - /* GL_ANGLE_framebuffer_blit */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglBlitFramebufferANGLE)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum); @@ -1044,15 +1041,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglRenderbufferStorageMultisampleAPPLE)( GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglResolveMultisampleFramebufferAPPLE)(void); #define glResolveMultisampleFramebufferAPPLE flextglResolveMultisampleFramebufferAPPLE -/* GL_APPLE_texture_format_BGRA8888 */ - - -/* GL_APPLE_texture_max_level */ - - -/* GL_ARM_rgba8 */ - - /* GL_ES_VERSION_2_0 */ GLAPI FLEXTGL_EXPORT void APIENTRY glActiveTexture(GLenum); @@ -1198,9 +1186,6 @@ GLAPI FLEXTGL_EXPORT void APIENTRY glVertexAttrib4fv(GLuint, const GLfloat *); GLAPI FLEXTGL_EXPORT void APIENTRY glVertexAttribPointer(GLuint, GLint, GLenum, GLboolean, GLsizei, const void *); GLAPI FLEXTGL_EXPORT void APIENTRY glViewport(GLint, GLint, GLsizei, GLsizei); -/* GL_EXT_blend_minmax */ - - /* GL_EXT_debug_label */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabelEXT)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *); @@ -1257,9 +1242,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglEnableiEXT)(GLenum, GLuint); GLAPI FLEXTGL_EXPORT GLboolean(APIENTRY *flextglIsEnablediEXT)(GLenum, GLuint); #define glIsEnablediEXT flextglIsEnablediEXT -/* GL_EXT_draw_instanced */ - - /* GL_EXT_instanced_arrays */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDrawArraysInstancedEXT)(GLenum, GLint, GLsizei, GLsizei); @@ -1307,9 +1289,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetQueryivEXT)(GLenum, GLenum, GLint GLAPI FLEXTGL_EXPORT GLboolean(APIENTRY *flextglIsQueryEXT)(GLuint); #define glIsQueryEXT flextglIsQueryEXT -/* GL_EXT_read_format_bgra */ - - /* GL_EXT_robustness */ GLAPI FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusEXT)(void); @@ -1321,12 +1300,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformivEXT)(GLuint, GLint, GLsi GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsEXT)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *); #define glReadnPixelsEXT flextglReadnPixelsEXT -/* GL_EXT_sRGB */ - - -/* GL_EXT_sRGB_write_control */ - - /* GL_EXT_separate_shader_objects */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglActiveShaderProgramEXT)(GLuint, GLuint); @@ -1418,12 +1391,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglUseProgramStagesEXT)(GLuint, GLbitfie GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglValidateProgramPipelineEXT)(GLuint); #define glValidateProgramPipelineEXT flextglValidateProgramPipelineEXT -/* GL_EXT_shader_texture_lod */ - - -/* GL_EXT_shadow_samplers */ - - /* GL_EXT_texture_border_clamp */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetSamplerParameterIivEXT)(GLuint, GLenum, GLint *); @@ -1443,21 +1410,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglTexParameterIivEXT)(GLenum, GLenum, c GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglTexParameterIuivEXT)(GLenum, GLenum, const GLuint *); #define glTexParameterIuivEXT flextglTexParameterIuivEXT -/* GL_EXT_texture_compression_s3tc */ - - -/* GL_EXT_texture_filter_anisotropic */ - - -/* GL_EXT_texture_format_BGRA8888 */ - - -/* GL_EXT_texture_rg */ - - -/* GL_EXT_texture_sRGB_decode */ - - /* GL_EXT_texture_storage */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglTexStorage1DEXT)(GLenum, GLsizei, GLenum, GLsizei); @@ -1473,20 +1425,11 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglTextureStorage2DEXT)(GLuint, GLenum, GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglTextureStorage3DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei); #define glTextureStorage3DEXT flextglTextureStorage3DEXT -/* GL_EXT_texture_type_2_10_10_10_REV */ - - /* GL_KHR_blend_equation_advanced */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglBlendBarrierKHR)(void); #define glBlendBarrierKHR flextglBlendBarrierKHR -/* GL_KHR_blend_equation_advanced_coherent */ - - -/* GL_KHR_context_flush_control */ - - /* GL_KHR_debug */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageCallbackKHR)(GLDEBUGPROCKHR, const void *); @@ -1512,9 +1455,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroupKHR)(void); GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroupKHR)(GLenum, GLuint, GLsizei, const GLchar *); #define glPushDebugGroupKHR flextglPushDebugGroupKHR -/* GL_KHR_robust_buffer_access_behavior */ - - /* GL_KHR_robustness */ GLAPI FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusKHR)(void); @@ -1528,12 +1468,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformuivKHR)(GLuint, GLint, GLs GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsKHR)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *); #define glReadnPixelsKHR flextglReadnPixelsKHR -/* GL_KHR_texture_compression_astc_hdr */ - - -/* GL_KHR_texture_compression_astc_ldr */ - - /* GL_NV_draw_buffers */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDrawBuffersNV)(GLsizei, const GLenum *); @@ -1546,9 +1480,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDrawArraysInstancedNV)(GLenum, GLint, GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDrawElementsInstancedNV)(GLenum, GLsizei, GLenum, const void *, GLsizei); #define glDrawElementsInstancedNV flextglDrawElementsInstancedNV -/* GL_NV_fbo_color_attachments */ - - /* GL_NV_framebuffer_blit */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglBlitFramebufferNV)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum); @@ -1574,39 +1505,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPolygonModeNV)(GLenum, GLenum); GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglReadBufferNV)(GLenum); #define glReadBufferNV flextglReadBufferNV -/* GL_NV_read_buffer_front */ - - -/* GL_NV_read_depth */ - - -/* GL_NV_read_depth_stencil */ - - -/* GL_NV_read_stencil */ - - -/* GL_NV_shadow_samplers_array */ - - -/* GL_NV_shadow_samplers_cube */ - - -/* GL_NV_texture_border_clamp */ - - -/* GL_OES_depth24 */ - - -/* GL_OES_depth32 */ - - -/* GL_OES_depth_texture */ - - -/* GL_OES_element_index_uint */ - - /* GL_OES_mapbuffer */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetBufferPointervOES)(GLenum, GLenum, void **); @@ -1616,27 +1514,6 @@ GLAPI FLEXTGL_EXPORT void *(APIENTRY *flextglMapBufferOES)(GLenum, GLenum); GLAPI FLEXTGL_EXPORT GLboolean(APIENTRY *flextglUnmapBufferOES)(GLenum); #define glUnmapBufferOES flextglUnmapBufferOES -/* GL_OES_packed_depth_stencil */ - - -/* GL_OES_required_internalformat */ - - -/* GL_OES_rgb8_rgba8 */ - - -/* GL_OES_standard_derivatives */ - - -/* GL_OES_stencil1 */ - - -/* GL_OES_stencil4 */ - - -/* GL_OES_surfaceless_context */ - - /* GL_OES_texture_3D */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglCompressedTexImage3DOES)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const void *); @@ -1652,24 +1529,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglTexImage3DOES)(GLenum, GLint, GLenum, GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglTexSubImage3DOES)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const void *); #define glTexSubImage3DOES flextglTexSubImage3DOES -/* GL_OES_texture_float */ - - -/* GL_OES_texture_float_linear */ - - -/* GL_OES_texture_half_float */ - - -/* GL_OES_texture_half_float_linear */ - - -/* GL_OES_texture_npot */ - - -/* GL_OES_texture_stencil8 */ - - /* GL_OES_vertex_array_object */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglBindVertexArrayOES)(GLuint); @@ -1681,9 +1540,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGenVertexArraysOES)(GLsizei, GLuint * GLAPI FLEXTGL_EXPORT GLboolean(APIENTRY *flextglIsVertexArrayOES)(GLuint); #define glIsVertexArrayOES flextglIsVertexArrayOES -/* GL_OES_vertex_half_float */ - - #ifdef __cplusplus } #endif diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGL.h.template b/src/MagnumExternal/OpenGL/GLES2/flextGL.h.template index c923899c4..42b022107 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGL.h.template +++ b/src/MagnumExternal/OpenGL/GLES2/flextGL.h.template @@ -66,6 +66,7 @@ void flextGLInit(); /* Function prototypes */ @for cat,funcs in functions: +@if funcs: /* GL_@cat */ @@ -82,6 +83,7 @@ GLAPI FLEXTGL_EXPORT @f.returntype\ @end @end @end +@end #ifdef __cplusplus } diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h b/src/MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h index 6235d465c..647a27cc0 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h +++ b/src/MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h @@ -457,9 +457,6 @@ typedef khronos_ssize_t GLsizeiptr; /* Function prototypes */ -/* GL_ANGLE_depth_texture */ - - /* GL_ANGLE_instanced_arrays */ GLAPI void glDrawArraysInstancedANGLE(GLenum, GLint, GLsizei, GLsizei); @@ -611,43 +608,10 @@ GLAPI void glVertexAttrib4fv(GLuint, const GLfloat *); GLAPI void glVertexAttribPointer(GLuint, GLint, GLenum, GLboolean, GLsizei, const void *); GLAPI void glViewport(GLint, GLint, GLsizei, GLsizei); -/* GL_EXT_blend_minmax */ - - /* GL_EXT_draw_buffers */ GLAPI void glDrawBuffersEXT(GLsizei, const GLenum *); -/* GL_EXT_sRGB */ - - -/* GL_EXT_shader_texture_lod */ - - -/* GL_EXT_texture_compression_s3tc */ - - -/* GL_EXT_texture_filter_anisotropic */ - - -/* GL_OES_element_index_uint */ - - -/* GL_OES_standard_derivatives */ - - -/* GL_OES_texture_float */ - - -/* GL_OES_texture_float_linear */ - - -/* GL_OES_texture_half_float */ - - -/* GL_OES_texture_half_float_linear */ - - /* GL_OES_vertex_array_object */ GLAPI void glBindVertexArrayOES(GLuint); diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp b/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp index aac2e1f7f..d7df7679f 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp +++ b/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp @@ -8,8 +8,6 @@ void flextGLInit() { Magnum::Platform::Implementation::OpenGLFunctionLoader loader; - /* GL_ANGLE_depth_texture */ - /* GL_ANGLE_framebuffer_blit */ flextglBlitFramebufferANGLE = reinterpret_cast(loader.load("glBlitFramebufferANGLE")); @@ -25,14 +23,6 @@ void flextGLInit() { flextglRenderbufferStorageMultisampleAPPLE = reinterpret_cast(loader.load("glRenderbufferStorageMultisampleAPPLE")); flextglResolveMultisampleFramebufferAPPLE = reinterpret_cast(loader.load("glResolveMultisampleFramebufferAPPLE")); - /* GL_APPLE_texture_format_BGRA8888 */ - - /* GL_APPLE_texture_max_level */ - - /* GL_ARM_rgba8 */ - - /* GL_EXT_blend_minmax */ - /* GL_EXT_debug_label */ flextglGetObjectLabelEXT = reinterpret_cast(loader.load("glGetObjectLabelEXT")); flextglLabelObjectEXT = reinterpret_cast(loader.load("glLabelObjectEXT")); @@ -64,8 +54,6 @@ void flextGLInit() { flextglEnableiEXT = reinterpret_cast(loader.load("glEnableiEXT")); flextglIsEnablediEXT = reinterpret_cast(loader.load("glIsEnablediEXT")); - /* GL_EXT_draw_instanced */ - /* GL_EXT_instanced_arrays */ flextglDrawArraysInstancedEXT = reinterpret_cast(loader.load("glDrawArraysInstancedEXT")); flextglDrawElementsInstancedEXT = reinterpret_cast(loader.load("glDrawElementsInstancedEXT")); @@ -92,18 +80,12 @@ void flextGLInit() { flextglGetQueryivEXT = reinterpret_cast(loader.load("glGetQueryivEXT")); flextglIsQueryEXT = reinterpret_cast(loader.load("glIsQueryEXT")); - /* GL_EXT_read_format_bgra */ - /* GL_EXT_robustness */ flextglGetGraphicsResetStatusEXT = reinterpret_cast(loader.load("glGetGraphicsResetStatusEXT")); flextglGetnUniformfvEXT = reinterpret_cast(loader.load("glGetnUniformfvEXT")); flextglGetnUniformivEXT = reinterpret_cast(loader.load("glGetnUniformivEXT")); flextglReadnPixelsEXT = reinterpret_cast(loader.load("glReadnPixelsEXT")); - /* GL_EXT_sRGB */ - - /* GL_EXT_sRGB_write_control */ - /* GL_EXT_separate_shader_objects */ flextglActiveShaderProgramEXT = reinterpret_cast(loader.load("glActiveShaderProgramEXT")); flextglBindProgramPipelineEXT = reinterpret_cast(loader.load("glBindProgramPipelineEXT")); @@ -150,10 +132,6 @@ void flextGLInit() { flextglUseProgramStagesEXT = reinterpret_cast(loader.load("glUseProgramStagesEXT")); flextglValidateProgramPipelineEXT = reinterpret_cast(loader.load("glValidateProgramPipelineEXT")); - /* GL_EXT_shader_texture_lod */ - - /* GL_EXT_shadow_samplers */ - /* GL_EXT_texture_border_clamp */ flextglGetSamplerParameterIivEXT = reinterpret_cast(loader.load("glGetSamplerParameterIivEXT")); flextglGetSamplerParameterIuivEXT = reinterpret_cast(loader.load("glGetSamplerParameterIuivEXT")); @@ -164,16 +142,6 @@ void flextGLInit() { flextglTexParameterIivEXT = reinterpret_cast(loader.load("glTexParameterIivEXT")); flextglTexParameterIuivEXT = reinterpret_cast(loader.load("glTexParameterIuivEXT")); - /* GL_EXT_texture_compression_s3tc */ - - /* GL_EXT_texture_filter_anisotropic */ - - /* GL_EXT_texture_format_BGRA8888 */ - - /* GL_EXT_texture_rg */ - - /* GL_EXT_texture_sRGB_decode */ - /* GL_EXT_texture_storage */ flextglTexStorage1DEXT = reinterpret_cast(loader.load("glTexStorage1DEXT")); flextglTexStorage2DEXT = reinterpret_cast(loader.load("glTexStorage2DEXT")); @@ -182,15 +150,9 @@ void flextGLInit() { flextglTextureStorage2DEXT = reinterpret_cast(loader.load("glTextureStorage2DEXT")); flextglTextureStorage3DEXT = reinterpret_cast(loader.load("glTextureStorage3DEXT")); - /* GL_EXT_texture_type_2_10_10_10_REV */ - /* GL_KHR_blend_equation_advanced */ flextglBlendBarrierKHR = reinterpret_cast(loader.load("glBlendBarrierKHR")); - /* GL_KHR_blend_equation_advanced_coherent */ - - /* GL_KHR_context_flush_control */ - /* GL_KHR_debug */ flextglDebugMessageCallbackKHR = reinterpret_cast(loader.load("glDebugMessageCallbackKHR")); flextglDebugMessageControlKHR = reinterpret_cast(loader.load("glDebugMessageControlKHR")); @@ -204,8 +166,6 @@ void flextGLInit() { flextglPopDebugGroupKHR = reinterpret_cast(loader.load("glPopDebugGroupKHR")); flextglPushDebugGroupKHR = reinterpret_cast(loader.load("glPushDebugGroupKHR")); - /* GL_KHR_robust_buffer_access_behavior */ - /* GL_KHR_robustness */ flextglGetGraphicsResetStatusKHR = reinterpret_cast(loader.load("glGetGraphicsResetStatusKHR")); flextglGetnUniformfvKHR = reinterpret_cast(loader.load("glGetnUniformfvKHR")); @@ -213,10 +173,6 @@ void flextGLInit() { flextglGetnUniformuivKHR = reinterpret_cast(loader.load("glGetnUniformuivKHR")); flextglReadnPixelsKHR = reinterpret_cast(loader.load("glReadnPixelsKHR")); - /* GL_KHR_texture_compression_astc_hdr */ - - /* GL_KHR_texture_compression_astc_ldr */ - /* GL_NV_draw_buffers */ flextglDrawBuffersNV = reinterpret_cast(loader.load("glDrawBuffersNV")); @@ -224,8 +180,6 @@ void flextGLInit() { flextglDrawArraysInstancedNV = reinterpret_cast(loader.load("glDrawArraysInstancedNV")); flextglDrawElementsInstancedNV = reinterpret_cast(loader.load("glDrawElementsInstancedNV")); - /* GL_NV_fbo_color_attachments */ - /* GL_NV_framebuffer_blit */ flextglBlitFramebufferNV = reinterpret_cast(loader.load("glBlitFramebufferNV")); @@ -241,47 +195,11 @@ void flextGLInit() { /* GL_NV_read_buffer */ flextglReadBufferNV = reinterpret_cast(loader.load("glReadBufferNV")); - /* GL_NV_read_buffer_front */ - - /* GL_NV_read_depth */ - - /* GL_NV_read_depth_stencil */ - - /* GL_NV_read_stencil */ - - /* GL_NV_shadow_samplers_array */ - - /* GL_NV_shadow_samplers_cube */ - - /* GL_NV_texture_border_clamp */ - - /* GL_OES_depth24 */ - - /* GL_OES_depth32 */ - - /* GL_OES_depth_texture */ - - /* GL_OES_element_index_uint */ - /* GL_OES_mapbuffer */ flextglGetBufferPointervOES = reinterpret_cast(loader.load("glGetBufferPointervOES")); flextglMapBufferOES = reinterpret_cast(loader.load("glMapBufferOES")); flextglUnmapBufferOES = reinterpret_cast(loader.load("glUnmapBufferOES")); - /* GL_OES_packed_depth_stencil */ - - /* GL_OES_required_internalformat */ - - /* GL_OES_rgb8_rgba8 */ - - /* GL_OES_standard_derivatives */ - - /* GL_OES_stencil1 */ - - /* GL_OES_stencil4 */ - - /* GL_OES_surfaceless_context */ - /* GL_OES_texture_3D */ flextglCompressedTexImage3DOES = reinterpret_cast(loader.load("glCompressedTexImage3DOES")); flextglCompressedTexSubImage3DOES = reinterpret_cast(loader.load("glCompressedTexSubImage3DOES")); @@ -290,23 +208,9 @@ void flextGLInit() { flextglTexImage3DOES = reinterpret_cast(loader.load("glTexImage3DOES")); flextglTexSubImage3DOES = reinterpret_cast(loader.load("glTexSubImage3DOES")); - /* GL_OES_texture_float */ - - /* GL_OES_texture_float_linear */ - - /* GL_OES_texture_half_float */ - - /* GL_OES_texture_half_float_linear */ - - /* GL_OES_texture_npot */ - - /* GL_OES_texture_stencil8 */ - /* GL_OES_vertex_array_object */ flextglBindVertexArrayOES = reinterpret_cast(loader.load("glBindVertexArrayOES")); flextglDeleteVertexArraysOES = reinterpret_cast(loader.load("glDeleteVertexArraysOES")); flextglGenVertexArraysOES = reinterpret_cast(loader.load("glGenVertexArraysOES")); flextglIsVertexArrayOES = reinterpret_cast(loader.load("glIsVertexArrayOES")); - - /* GL_OES_vertex_half_float */ } diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp.template b/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp.template index 37e72476a..e6acbc296 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp.template +++ b/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp.template @@ -9,7 +9,7 @@ void flextGLInit() { Magnum::Platform::Implementation::OpenGLFunctionLoader loader; @for category,funcs in functions: - @if category not in ['ES_VERSION_2_0']: + @if funcs and category not in ['ES_VERSION_2_0']: /* GL_@category */ @for f in funcs: diff --git a/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template b/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template index b7ff7e5a7..3392b71d5 100644 --- a/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template +++ b/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template @@ -45,6 +45,7 @@ void flextGLInit(); /* Function prototypes */ @for cat,funcs in functions: +@if funcs: /* GL_@cat */ @@ -53,6 +54,7 @@ GLAPI @f.returntype gl@f.name\ (@f.param_type_list_string()); @end @end +@end #ifdef __cplusplus } diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.cpp.template b/src/MagnumExternal/OpenGL/GLES3/flextGL.cpp.template index 43f61ce3e..4d43fe789 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.cpp.template +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.cpp.template @@ -5,7 +5,7 @@ extern "C" { #endif @for category,funcs in functions: -@if len(funcs) > 0 and category not in ['ES_VERSION_2_0', 'ES_VERSION_3_0']: +@if funcs and category not in ['ES_VERSION_2_0', 'ES_VERSION_3_0']: /* GL_@category */ @for f in funcs: diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h b/src/MagnumExternal/OpenGL/GLES3/flextGL.h index ddbb93b1d..53fc2d6a5 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h @@ -1339,12 +1339,6 @@ typedef khronos_ssize_t GLsizeiptr; /* Function prototypes */ -/* GL_ANDROID_extension_pack_es31a */ - - -/* GL_APPLE_texture_format_BGRA8888 */ - - /* GL_ES_VERSION_2_0 */ GLAPI FLEXTGL_EXPORT void APIENTRY glActiveTexture(GLenum); @@ -1806,9 +1800,6 @@ GLAPI FLEXTGL_EXPORT GLboolean(APIENTRY *flextglIsEnablediEXT)(GLenum, GLuint); GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglFramebufferTextureEXT)(GLenum, GLenum, GLuint, GLint); #define glFramebufferTextureEXT flextglFramebufferTextureEXT -/* GL_EXT_gpu_shader5 */ - - /* GL_EXT_multi_draw_arrays */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawArraysEXT)(GLenum, const GLint *, const GLsizei *, GLsizei); @@ -1828,9 +1819,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglRenderbufferStorageMultisampleEXT)(GL GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPrimitiveBoundingBoxEXT)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); #define glPrimitiveBoundingBoxEXT flextglPrimitiveBoundingBoxEXT -/* GL_EXT_read_format_bgra */ - - /* GL_EXT_robustness */ GLAPI FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusEXT)(void); @@ -1842,9 +1830,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformivEXT)(GLuint, GLint, GLsi GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsEXT)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *); #define glReadnPixelsEXT flextglReadnPixelsEXT -/* GL_EXT_sRGB_write_control */ - - /* GL_EXT_separate_shader_objects */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglActiveShaderProgramEXT)(GLuint, GLuint); @@ -1936,12 +1921,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglUseProgramStagesEXT)(GLuint, GLbitfie GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglValidateProgramPipelineEXT)(GLuint); #define glValidateProgramPipelineEXT flextglValidateProgramPipelineEXT -/* GL_EXT_shader_integer_mix */ - - -/* GL_EXT_shader_io_blocks */ - - /* GL_EXT_tessellation_shader */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPatchParameteriEXT)(GLenum, GLint); @@ -1973,32 +1952,11 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglTexBufferEXT)(GLenum, GLenum, GLuint) GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglTexBufferRangeEXT)(GLenum, GLenum, GLuint, GLintptr, GLsizeiptr); #define glTexBufferRangeEXT flextglTexBufferRangeEXT -/* GL_EXT_texture_compression_s3tc */ - - -/* GL_EXT_texture_cube_map_array */ - - -/* GL_EXT_texture_filter_anisotropic */ - - -/* GL_EXT_texture_format_BGRA8888 */ - - -/* GL_EXT_texture_sRGB_decode */ - - /* GL_KHR_blend_equation_advanced */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglBlendBarrierKHR)(void); #define glBlendBarrierKHR flextglBlendBarrierKHR -/* GL_KHR_blend_equation_advanced_coherent */ - - -/* GL_KHR_context_flush_control */ - - /* GL_KHR_debug */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageCallbackKHR)(GLDEBUGPROCKHR, const void *); @@ -2024,9 +1982,6 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroupKHR)(void); GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroupKHR)(GLenum, GLuint, GLsizei, const GLchar *); #define glPushDebugGroupKHR flextglPushDebugGroupKHR -/* GL_KHR_robust_buffer_access_behavior */ - - /* GL_KHR_robustness */ GLAPI FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusKHR)(void); @@ -2040,38 +1995,11 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformuivKHR)(GLuint, GLint, GLs GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsKHR)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *); #define glReadnPixelsKHR flextglReadnPixelsKHR -/* GL_KHR_texture_compression_astc_hdr */ - - -/* GL_KHR_texture_compression_astc_ldr */ - - /* GL_NV_polygon_mode */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglPolygonModeNV)(GLenum, GLenum); #define glPolygonModeNV flextglPolygonModeNV -/* GL_NV_read_buffer_front */ - - -/* GL_NV_read_depth */ - - -/* GL_NV_read_depth_stencil */ - - -/* GL_NV_read_stencil */ - - -/* GL_NV_shader_noperspective_interpolation */ - - -/* GL_NV_texture_border_clamp */ - - -/* GL_OES_depth32 */ - - /* GL_OES_mapbuffer */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglGetBufferPointervOES)(GLenum, GLenum, void **); @@ -2086,24 +2014,6 @@ GLAPI FLEXTGL_EXPORT GLboolean(APIENTRY *flextglUnmapBufferOES)(GLenum); GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglMinSampleShadingOES)(GLfloat); #define glMinSampleShadingOES flextglMinSampleShadingOES -/* GL_OES_sample_variables */ - - -/* GL_OES_shader_image_atomic */ - - -/* GL_OES_shader_multisample_interpolation */ - - -/* GL_OES_stencil1 */ - - -/* GL_OES_stencil4 */ - - -/* GL_OES_texture_stencil8 */ - - /* GL_OES_texture_storage_multisample_2d_array */ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglTexStorage3DMultisampleOES)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, GLboolean); diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template b/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template index 25e6139de..38c44b297 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template @@ -70,6 +70,7 @@ void flextGLInit(); /* Function prototypes */ @for cat,funcs in functions: +@if funcs: /* GL_@cat */ @@ -86,6 +87,7 @@ GLAPI FLEXTGL_EXPORT @f.returntype\ @end @end @end +@end #ifdef __cplusplus } diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h b/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h index 7bec8e0ee..7e98e29f8 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h @@ -955,12 +955,6 @@ GLAPI void glVertexAttribI4uiv(GLuint, const GLuint *); GLAPI void glVertexAttribIPointer(GLuint, GLint, GLenum, GLsizei, const void *); GLAPI void glWaitSync(GLsync, GLbitfield, GLuint64); -/* GL_EXT_texture_compression_s3tc */ - - -/* GL_EXT_texture_filter_anisotropic */ - - #ifdef __cplusplus } #endif diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp index 42a421518..9b6260361 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp @@ -8,10 +8,6 @@ void flextGLInit() { Magnum::Platform::Implementation::OpenGLFunctionLoader loader; - /* GL_ANDROID_extension_pack_es31a */ - - /* GL_APPLE_texture_format_BGRA8888 */ - /* GL_ES_VERSION_3_1 */ flextglActiveShaderProgram = reinterpret_cast(loader.load("glActiveShaderProgram")); flextglBindImageTexture = reinterpret_cast(loader.load("glBindImageTexture")); @@ -120,8 +116,6 @@ void flextGLInit() { /* GL_EXT_geometry_shader */ flextglFramebufferTextureEXT = reinterpret_cast(loader.load("glFramebufferTextureEXT")); - /* GL_EXT_gpu_shader5 */ - /* GL_EXT_multi_draw_arrays */ flextglMultiDrawArraysEXT = reinterpret_cast(loader.load("glMultiDrawArraysEXT")); flextglMultiDrawElementsEXT = reinterpret_cast(loader.load("glMultiDrawElementsEXT")); @@ -133,16 +127,12 @@ void flextGLInit() { /* GL_EXT_primitive_bounding_box */ flextglPrimitiveBoundingBoxEXT = reinterpret_cast(loader.load("glPrimitiveBoundingBoxEXT")); - /* GL_EXT_read_format_bgra */ - /* GL_EXT_robustness */ flextglGetGraphicsResetStatusEXT = reinterpret_cast(loader.load("glGetGraphicsResetStatusEXT")); flextglGetnUniformfvEXT = reinterpret_cast(loader.load("glGetnUniformfvEXT")); flextglGetnUniformivEXT = reinterpret_cast(loader.load("glGetnUniformivEXT")); flextglReadnPixelsEXT = reinterpret_cast(loader.load("glReadnPixelsEXT")); - /* GL_EXT_sRGB_write_control */ - /* GL_EXT_separate_shader_objects */ flextglActiveShaderProgramEXT = reinterpret_cast(loader.load("glActiveShaderProgramEXT")); flextglBindProgramPipelineEXT = reinterpret_cast(loader.load("glBindProgramPipelineEXT")); @@ -189,10 +179,6 @@ void flextGLInit() { flextglUseProgramStagesEXT = reinterpret_cast(loader.load("glUseProgramStagesEXT")); flextglValidateProgramPipelineEXT = reinterpret_cast(loader.load("glValidateProgramPipelineEXT")); - /* GL_EXT_shader_integer_mix */ - - /* GL_EXT_shader_io_blocks */ - /* GL_EXT_tessellation_shader */ flextglPatchParameteriEXT = reinterpret_cast(loader.load("glPatchParameteriEXT")); @@ -210,23 +196,9 @@ void flextGLInit() { flextglTexBufferEXT = reinterpret_cast(loader.load("glTexBufferEXT")); flextglTexBufferRangeEXT = reinterpret_cast(loader.load("glTexBufferRangeEXT")); - /* GL_EXT_texture_compression_s3tc */ - - /* GL_EXT_texture_cube_map_array */ - - /* GL_EXT_texture_filter_anisotropic */ - - /* GL_EXT_texture_format_BGRA8888 */ - - /* GL_EXT_texture_sRGB_decode */ - /* GL_KHR_blend_equation_advanced */ flextglBlendBarrierKHR = reinterpret_cast(loader.load("glBlendBarrierKHR")); - /* GL_KHR_blend_equation_advanced_coherent */ - - /* GL_KHR_context_flush_control */ - /* GL_KHR_debug */ flextglDebugMessageCallbackKHR = reinterpret_cast(loader.load("glDebugMessageCallbackKHR")); flextglDebugMessageControlKHR = reinterpret_cast(loader.load("glDebugMessageControlKHR")); @@ -240,8 +212,6 @@ void flextGLInit() { flextglPopDebugGroupKHR = reinterpret_cast(loader.load("glPopDebugGroupKHR")); flextglPushDebugGroupKHR = reinterpret_cast(loader.load("glPushDebugGroupKHR")); - /* GL_KHR_robust_buffer_access_behavior */ - /* GL_KHR_robustness */ flextglGetGraphicsResetStatusKHR = reinterpret_cast(loader.load("glGetGraphicsResetStatusKHR")); flextglGetnUniformfvKHR = reinterpret_cast(loader.load("glGetnUniformfvKHR")); @@ -249,27 +219,9 @@ void flextGLInit() { flextglGetnUniformuivKHR = reinterpret_cast(loader.load("glGetnUniformuivKHR")); flextglReadnPixelsKHR = reinterpret_cast(loader.load("glReadnPixelsKHR")); - /* GL_KHR_texture_compression_astc_hdr */ - - /* GL_KHR_texture_compression_astc_ldr */ - /* GL_NV_polygon_mode */ flextglPolygonModeNV = reinterpret_cast(loader.load("glPolygonModeNV")); - /* GL_NV_read_buffer_front */ - - /* GL_NV_read_depth */ - - /* GL_NV_read_depth_stencil */ - - /* GL_NV_read_stencil */ - - /* GL_NV_shader_noperspective_interpolation */ - - /* GL_NV_texture_border_clamp */ - - /* GL_OES_depth32 */ - /* GL_OES_mapbuffer */ flextglGetBufferPointervOES = reinterpret_cast(loader.load("glGetBufferPointervOES")); flextglMapBufferOES = reinterpret_cast(loader.load("glMapBufferOES")); @@ -278,18 +230,6 @@ void flextGLInit() { /* GL_OES_sample_shading */ flextglMinSampleShadingOES = reinterpret_cast(loader.load("glMinSampleShadingOES")); - /* GL_OES_sample_variables */ - - /* GL_OES_shader_image_atomic */ - - /* GL_OES_shader_multisample_interpolation */ - - /* GL_OES_stencil1 */ - - /* GL_OES_stencil4 */ - - /* GL_OES_texture_stencil8 */ - /* GL_OES_texture_storage_multisample_2d_array */ flextglTexStorage3DMultisampleOES = reinterpret_cast(loader.load("glTexStorage3DMultisampleOES")); } diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp.template b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp.template index 756588a3a..11911b675 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp.template +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp.template @@ -9,7 +9,7 @@ void flextGLInit() { Magnum::Platform::Implementation::OpenGLFunctionLoader loader; @for category,funcs in functions: - @if category not in ['ES_VERSION_2_0', 'ES_VERSION_3_0']: + @if funcs and category not in ['ES_VERSION_2_0', 'ES_VERSION_3_0']: /* GL_@category */ @for f in funcs: