Merge branch 'master' into compatibility

CMakeLists.txt

@@ -49,6 +49,11 @@ cmake_dependent_option(WITH_SHAPES "Build Shapes library" ON "NOT WITH_DEBUGTOOL
 option(WITH_TEXT "Build Text library" ON)
 cmake_dependent_option(WITH_TEXTURETOOLS "Build TextureTools library" ON "NOT WITH_TEXT;NOT WITH_DISTANCEFIELDCONVERTER" ON)
 
+# EGL context, available everywhere except on platforms which don't support extension loading
+if(NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_NACL)
+    option(WITH_EGLCONTEXT "Build EglContext library" OFF)
+endif()
+
 # NaCl-specific application libraries
 if(CORRADE_TARGET_NACL)
     option(WITH_NACLAPPLICATION "Build NaClApplication library" OFF)
@@ -61,19 +66,19 @@ elseif(CORRADE_TARGET_ANDROID)
 # OS X-specific application libraries
 elseif(CORRADE_TARGET_APPLE)
     cmake_dependent_option(WITH_WINDOWLESSCGLAPPLICATION "Build WindowlessCglApplication library" OFF "NOT WITH_MAGNUMINFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON)
-    cmake_dependent_option(WITH_CGLCONTEXT "Build CglContext library" OFF "NOT TARGET_GLES" OFF)
+    option(WITH_CGLCONTEXT "Build CglContext library" OFF)
 
 # X11 + GLX/EGL-specific application libraries
 elseif(CORRADE_TARGET_UNIX)
     option(WITH_GLXAPPLICATION "Build GlxApplication library" OFF)
     cmake_dependent_option(WITH_WINDOWLESSGLXAPPLICATION "Build WindowlessGlxApplication library" OFF "NOT WITH_MAGNUMINFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON)
     cmake_dependent_option(WITH_XEGLAPPLICATION "Build XEglApplication library" OFF "TARGET_GLES" OFF)
-    cmake_dependent_option(WITH_GLXCONTEXT "Build GlxContext library" OFF "NOT TARGET_GLES" OFF)
+    option(WITH_GLXCONTEXT "Build GlxContext library" OFF)
 
 # Windows-specific application libraries
 elseif(CORRADE_TARGET_WINDOWS)
     cmake_dependent_option(WITH_WINDOWLESSWGLAPPLICATION "Build WindowlessWglApplication library" OFF "NOT WITH_MAGNUMINFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON)
-    cmake_dependent_option(WITH_WGLCONTEXT "Build WglContext library" OFF "NOT TARGET_GLES" OFF)
+    option(WITH_WGLCONTEXT "Build WglContext library" OFF)
 endif()
 
 # Platform-independent (almost) application libraries

Doxyfile

@@ -262,6 +262,7 @@ ALIASES                = \
     "extension{2}=<a href=\"http://www.opengl.org/registry/specs/\1/\2.txt\"><tt>\1_\2</tt></a>" \
     "extension2{2}=<a href=\"http://www.opengl.org/registry/specs/\1/\1_\2.txt\"><tt>\1_\2</tt></a>" \
     "requires_gles30=@xrefitem requires-gles30 \"Requires OpenGL ES 3.0\" \"Functionality requiring OpenGL ES 3.0\"" \
+    "requires_gles31=@xrefitem requires-gles31 \"Requires OpenGL ES 3.1\" \"Functionality requiring OpenGL ES 3.1\"" \
     "requires_gl=@xrefitem requires-gl \"Requires desktop OpenGL\" \"Functionality requiring desktop OpenGL (not available in OpenGL ES)\"" \
     "requires_gles20=@xrefitem requires-gles20 \"Requires OpenGL ES 2.0\" \"Functionality requiring OpenGL ES 2.0 (not available in ES 3.0 and desktop OpenGL)\"" \
     "requires_es_extension=@xrefitem requires-es-extension \"Requires OpenGL ES extension\" \"Functionality requiring specific OpenGL ES extension\"" \

README.md

@@ -43,7 +43,8 @@ Graphics APIs:
 
 *   **OpenGL** 2.1 through 4.4, core profile functionality and modern
     extensions
-*   **OpenGL ES** 2.0, 3.0 and extensions to match desktop OpenGL functionality
+*   **OpenGL ES** 2.0, 3.0, 3.1 and extensions to match desktop OpenGL
+    functionality
 *   **WebGL** 1.0 and extensions to match desktop OpenGL functionality
 
 Platforms:

doc/building.dox

@@ -210,6 +210,7 @@ choose to not use any application library (see @ref platform-custom for more
 information):
 
 -   `WITH_CGLCONTEXT` -- CGL context
+-   `WITH_EGLCONTEXT` -- EGL context
 -   `WITH_GLXCONTEXT` -- GLX context
 -   `WITH_WGLCONTEXT` -- WGL context
 

doc/cmake.dox

@@ -107,6 +107,7 @@ platform-specific context libraries (see @ref platform-custom for more
 information):
 
 -   `CglContext` -- CGL context
+-   `EglContext` -- EGL context
 -   `GlxContext` -- GLX context
 -   `WglContext` -- WGL context
 

doc/mainpage.dox

@@ -69,7 +69,8 @@ Graphics APIs:
 
 -   **OpenGL** 2.1 through 4.4, core profile functionality and modern
     extensions
--   **OpenGL ES** 2.0, 3.0 and extensions to match desktop OpenGL functionality
+-   **OpenGL ES** 2.0, 3.0, 3.1 and extensions to match desktop OpenGL
+    functionality
 -   **WebGL** 1.0 and extensions to match desktop OpenGL functionality
 
 Platforms:

doc/opengl-support.dox

@@ -238,6 +238,11 @@ supported.
 Features that have their equivalents implemented in desktop version are
 supported.
 
+@subsection opengl-support-es31 OpenGL ES 3.1
+
+Features that have their equivalents implemented in desktop version are
+supported.
+
 @subsection opengl-support-es30-extensions OpenGL ES 2.0 extensions to match ES 3.0 functionality
 
 %Extension                                   | Status

doc/opengl.dox

@@ -59,6 +59,7 @@ is supported on older Intel GPUs even if they are capable of OpenGL 2.1 only).
 - @subpage requires-gl
 - @subpage requires-gles20
 - @subpage requires-gles30
+- @subpage requires-gles31
 - @subpage requires-es-extension
 
 @see @ref building, @ref cmake, @ref MAGNUM_TARGET_GLES,
@@ -82,9 +83,14 @@ is supported on older Intel GPUs even if they are capable of OpenGL 2.1 only).
 @page requires-gles20 Functionality requiring OpenGL ES 2.0 (not available on desktop or ES 3.0)
 @see @ref MAGNUM_TARGET_GLES2
 
-@page requires-gles30 Functionality requiring OpenGL ES 3.0
+@page requires-gles30 Functionality requiring at least OpenGL ES 3.0
+
+The following symbols are not defined at all when targeting OpenGL ES 2.0.
+
 @see @ref MAGNUM_TARGET_GLES3
 
+@page requires-gles31 Functionality requiring OpenGL ES 3.1
+
 @page requires-es-extension Functionality requiring specific OpenGL ES extension
 @see @ref MAGNUM_TARGET_GLES2
 

doc/platform.dox

@@ -293,6 +293,7 @@ find particular `*Context` library, add its include dir and then link to it.
 These platform-specific libraries are available:
 
 -   `CglContext` -- CGL context (Mac OS X)
+-   `EglContext` -- EGL context (everywhere except Emscripten and NaCl)
 -   `GlxContext` -- GLX context (X11-based Unix)
 -   `WglContext` -- WGL context (Windows)
 

modules/FindMagnum.cmake

@@ -61,6 +61,7 @@
 #  WindowlessNaClApplication - Windowless NaCl application
 #  WindowlessWglApplication - Windowless WGL application
 #  CglContext       - CGL context
+#  EglContext       - EGL context
 #  GlxContext       - GLX context
 #  WglContext       - WGL context
 # Example usage with specifying additional components is:
@@ -430,6 +431,16 @@ foreach(component ${Magnum_FIND_COMPONENTS})
             endif()
         endif()
 
+        # EGL context dependencies
+        if(${component} STREQUAL EglContext)
+            find_package(EGL)
+            if(EGL_FOUND)
+                set(_MAGNUM_${_COMPONENT}_LIBRARIES ${EGL_LIBRARIES})
+            else()
+                unset(MAGNUM_${_COMPONENT}_LIBRARY)
+            endif()
+        endif()
+
         # No additional dependencies for CGL context
         # No additional dependencies for WGL context
 

package/archlinux/PKGBUILD

@@ -27,6 +27,7 @@ build() {
         -DWITH_GLXAPPLICATION=ON \
         -DWITH_SDL2APPLICATION=ON \
         -DWITH_WINDOWLESSGLXAPPLICATION=ON \
+        -DWITH_EGLCONTEXT=ON \
         -DWITH_GLXCONTEXT=ON \
         -DWITH_MAGNUMFONT=ON \
         -DWITH_MAGNUMFONTCONVERTER=ON \

package/archlinux/PKGBUILD-android-arm

@@ -32,7 +32,8 @@ build() {
         -DWITH_OBJIMPORTER=ON \
         -DWITH_TGAIMAGECONVERTER=ON \
         -DWITH_TGAIMPORTER=ON \
-        -DWITH_ANDROIDAPPLICATION=ON
+        -DWITH_ANDROIDAPPLICATION=ON \
+        -DWITH_EGLCONTEXT=ON
     ninja
 }
 

package/archlinux/PKGBUILD-android-x86

@@ -32,7 +32,8 @@ build() {
         -DWITH_OBJIMPORTER=ON \
         -DWITH_TGAIMAGECONVERTER=ON \
         -DWITH_TGAIMPORTER=ON \
-        -DWITH_ANDROIDAPPLICATION=ON
+        -DWITH_ANDROIDAPPLICATION=ON \
+        -DWITH_EGLCONTEXT=ON
     ninja
 }
 

package/archlinux/PKGBUILD-clang

@@ -31,6 +31,7 @@ build() {
         -DWITH_GLXAPPLICATION=ON \
         -DWITH_SDL2APPLICATION=ON \
         -DWITH_WINDOWLESSGLXAPPLICATION=ON \
+        -DWITH_EGLCONTEXT=ON \
         -DWITH_GLXCONTEXT=ON \
         -DWITH_MAGNUMFONT=ON \
         -DWITH_MAGNUMFONTCONVERTER=ON \

package/archlinux/PKGBUILD-clang-libc++

@@ -33,6 +33,7 @@ build() {
         -DWITH_GLXAPPLICATION=ON \
         -DWITH_SDL2APPLICATION=ON \
         -DWITH_WINDOWLESSGLXAPPLICATION=ON \
+        -DWITH_EGLCONTEXT=ON \
         -DWITH_GLXCONTEXT=ON \
         -DWITH_MAGNUMFONT=ON \
         -DWITH_MAGNUMFONTCONVERTER=ON \

package/archlinux/PKGBUILD-es2

@@ -22,6 +22,7 @@ build() {
         -DTARGET_GLES2=ON \
         -DWITH_AUDIO=ON \
         -DWITH_XEGLAPPLICATION=ON \
+        -DWITH_EGLCONTEXT=ON \
         -DWITH_MAGNUMFONT=ON \
         -DWITH_OBJIMPORTER=ON \
         -DWITH_TGAIMAGECONVERTER=ON \

package/archlinux/PKGBUILD-es2desktop

@@ -25,6 +25,7 @@ build() {
         -DWITH_SDL2APPLICATION=ON \
         -DWITH_GLXAPPLICATION=ON \
         -DWITH_WINDOWLESSGLXAPPLICATION=ON \
+        -DWITH_EGLCONTEXT=ON \
         -DWITH_GLXCONTEXT=ON \
         -DWITH_MAGNUMFONT=ON \
         -DWITH_OBJIMPORTER=ON \

package/archlinux/PKGBUILD-es3

@@ -22,6 +22,7 @@ build() {
         -DTARGET_GLES2=OFF \
         -DWITH_AUDIO=ON \
         -DWITH_XEGLAPPLICATION=ON \
+        -DWITH_EGLCONTEXT=ON \
         -DWITH_MAGNUMFONT=ON \
         -DWITH_OBJIMPORTER=ON \
         -DWITH_TGAIMAGECONVERTER=ON \

package/archlinux/PKGBUILD-es3desktop

@@ -25,6 +25,7 @@ build() {
         -DWITH_SDL2APPLICATION=ON \
         -DWITH_GLXAPPLICATION=ON \
         -DWITH_WINDOWLESSGLXAPPLICATION=ON \
+        -DWITH_EGLCONTEXT=ON \
         -DWITH_GLXCONTEXT=ON \
         -DWITH_MAGNUMFONT=ON \
         -DWITH_OBJIMPORTER=ON \

package/archlinux/PKGBUILD-gcc47

@@ -31,6 +31,7 @@ build() {
         -DWITH_GLXAPPLICATION=ON \
         -DWITH_SDL2APPLICATION=ON \
         -DWITH_WINDOWLESSGLXAPPLICATION=ON \
+        -DWITH_EGLCONTEXT=ON \
         -DWITH_GLXCONTEXT=ON \
         -DWITH_MAGNUMFONT=ON \
         -DWITH_MAGNUMFONTCONVERTER=ON \

package/archlinux/PKGBUILD-release

@@ -23,6 +23,7 @@ build() {
         -DWITH_GLXAPPLICATION=ON \
         -DWITH_SDL2APPLICATION=ON \
         -DWITH_WINDOWLESSGLXAPPLICATION=ON \
+        -DWITH_EGLCONTEXT=ON \
         -DWITH_GLXCONTEXT=ON \
         -DWITH_MAGNUMFONT=ON \
         -DWITH_MAGNUMFONTCONVERTER=ON \

package/ci/jenkins-android.xml

@@ -79,6 +79,7 @@ cmake .. \
     -DBUILD_DEPRECATED=${deprecated_build_flag} \
   `#-DWITH_AUDIO=ON` \
     -DWITH_ANDROIDAPPLICATION=ON \
+    -DWITH_EGLCONTEXT=ON \
     -DWITH_MAGNUMFONT=ON \
     -DWITH_MAGNUMFONTCONVERTER=ON \
     -DWITH_OBJIMPORTER=ON \

package/ci/jenkins.xml

@@ -143,6 +143,7 @@ cmake .. \
     -DWITH_GLXAPPLICATION=ON \
     -DWITH_SDL2APPLICATION=ON \
     -DWITH_XEGLAPPLICATION=${es_flag} \
+    -DWITH_EGLCONTEXT=ON \
     -DWITH_GLXCONTEXT=ON \
     -DWITH_MAGNUMFONT=ON \
     -DWITH_MAGNUMFONTCONVERTER=${desktop_flag} \

package/debian/rules

@@ -9,6 +9,7 @@ override_dh_auto_configure:
 		-DWITH_GLUTAPPLICATION=ON \
 		-DWITH_GLXAPPLICATION=ON \
 		-DWITH_WINDOWLESSGLXAPPLICATION=ON \
+		-DWITH_EGLCONTEXT=ON \
 		-DWITH_GLXCONTEXT=ON \
 		-DWITH_MAGNUMFONT=ON \
 		-DWITH_MAGNUMFONTCONVERTER=ON \

src/Magnum/AbstractFramebuffer.cpp

@@ -140,16 +140,28 @@ void AbstractFramebuffer::blit(AbstractFramebuffer& source, AbstractFramebuffer&
 }
 
 #ifdef MAGNUM_TARGET_GLES2
-void AbstractFramebuffer::blitImplementationANGLE(const Range2Di&, const Range2Di&, FramebufferBlitMask, FramebufferBlitFilter) {
-    /** @todo Re-enable when extension loader is available for ES */
-    CORRADE_INTERNAL_ASSERT(false);
-    //glBlitFramebufferANGLE(sourceRectangle.left(), sourceRectangle.bottom(), sourceRectangle.right(), sourceRectangle.top(), destinationRectangle.left(), destinationRectangle.bottom(), destinationRectangle.right(), destinationRectangle.top(), GLbitfield(mask), GLenum(filter));
+void AbstractFramebuffer::blitImplementationANGLE(const Range2Di& sourceRectangle, const Range2Di& destinationRectangle, const FramebufferBlitMask mask, const FramebufferBlitFilter filter) {
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glBlitFramebufferANGLE(sourceRectangle.left(), sourceRectangle.bottom(), sourceRectangle.right(), sourceRectangle.top(), destinationRectangle.left(), destinationRectangle.bottom(), destinationRectangle.right(), destinationRectangle.top(), GLbitfield(mask), GLenum(filter));
+    #else
+    static_cast<void>(sourceRectangle);
+    static_cast<void>(destinationRectangle);
+    static_cast<void>(mask);
+    static_cast<void>(filter);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 
-void AbstractFramebuffer::blitImplementationNV(const Range2Di&, const Range2Di&, FramebufferBlitMask, FramebufferBlitFilter) {
-    /** @todo Re-enable when extension loader is available for ES */
-    CORRADE_INTERNAL_ASSERT(false);
-    //glBlitFramebufferNV(sourceRectangle.left(), sourceRectangle.bottom(), sourceRectangle.right(), sourceRectangle.top(), destinationRectangle.left(), destinationRectangle.bottom(), destinationRectangle.right(), destinationRectangle.top(), GLbitfield(mask), GLenum(filter));
+void AbstractFramebuffer::blitImplementationNV(const Range2Di& sourceRectangle, const Range2Di& destinationRectangle, const FramebufferBlitMask mask, const FramebufferBlitFilter filter) {
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glBlitFramebufferNV(sourceRectangle.left(), sourceRectangle.bottom(), sourceRectangle.right(), sourceRectangle.top(), destinationRectangle.left(), destinationRectangle.bottom(), destinationRectangle.right(), destinationRectangle.top(), GLbitfield(mask), GLenum(filter));
+    #else
+    static_cast<void>(sourceRectangle);
+    static_cast<void>(destinationRectangle);
+    static_cast<void>(mask);
+    static_cast<void>(filter);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 #endif
 
@@ -218,14 +230,14 @@ void AbstractFramebuffer::read(const Vector2i& offset, const Vector2i& size, Buf
 void AbstractFramebuffer::invalidateImplementationNoOp(GLsizei, const GLenum* const) {}
 
 void AbstractFramebuffer::invalidateImplementationDefault(const GLsizei count, const GLenum* const attachments) {
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES2
     glInvalidateFramebuffer(GLenum(bindInternal()), count, attachments);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glDiscardFramebufferEXT(GLenum(bindInternal()), count, attachments);
     #else
     static_cast<void>(count);
     static_cast<void>(attachments);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glDiscardFramebufferEXT(GLenum(bindInternal()), count, attachments);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -249,17 +261,20 @@ GLenum AbstractFramebuffer::checkStatusImplementationDSA(const FramebufferTarget
 #endif
 
 void AbstractFramebuffer::drawBuffersImplementationDefault(GLsizei count, const GLenum* buffers) {
-    /** @todo Re-enable when extension loader is available for ES */
-    #ifndef MAGNUM_TARGET_GLES2
     #ifndef MAGNUM_TARGET_GLES2
     bindInternal(FramebufferTarget::Draw);
     #else
-    bindInternal(drawTarget);
+    bindInternal(Context::current()->state().framebuffer->drawTarget);
     #endif
+
+    #ifndef MAGNUM_TARGET_GLES2
     glDrawBuffers(count, buffers);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glDrawBuffersNV(count, buffers);
     #else
     static_cast<void>(count);
     static_cast<void>(buffers);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -270,22 +285,21 @@ void AbstractFramebuffer::drawBuffersImplementationDSA(GLsizei count, const GLen
 #endif
 
 void AbstractFramebuffer::drawBufferImplementationDefault(GLenum buffer) {
-    /** @todo Re-enable when extension loader is available for ES */
-    #ifndef MAGNUM_TARGET_GLES2
     #ifndef MAGNUM_TARGET_GLES2
     bindInternal(FramebufferTarget::Draw);
     #else
-    bindInternal(drawTarget);
+    bindInternal(Context::current()->state().framebuffer->drawTarget);
     #endif
-    #ifndef MAGNUM_TARGET_GLES3
+
+    #ifndef MAGNUM_TARGET_GLES
     glDrawBuffer(buffer);
-    #else
+    #elif !defined(MAGNUM_TARGET_GLES2)
     glDrawBuffers(1, &buffer);
-    #endif
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glDrawBuffersNV(1, &buffer);
     #else
     static_cast<void>(buffer);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glDrawBuffersNV(1, &buffer);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -296,18 +310,19 @@ void AbstractFramebuffer::drawBufferImplementationDSA(GLenum buffer) {
 #endif
 
 void AbstractFramebuffer::readBufferImplementationDefault(GLenum buffer) {
-    /** @todo Re-enable when extension loader is available for ES */
-    #ifndef MAGNUM_TARGET_GLES2
     #ifndef MAGNUM_TARGET_GLES2
     bindInternal(FramebufferTarget::Read);
     #else
-    bindInternal(readTarget);
+    bindInternal(Context::current()->state().framebuffer->readTarget);
     #endif
+
+    #ifndef MAGNUM_TARGET_GLES2
     glReadBuffer(buffer);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glReadBufferNV(buffer);
     #else
     static_cast<void>(buffer);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glReadBufferNV(buffer);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -322,9 +337,10 @@ void AbstractFramebuffer::readImplementationDefault(const Vector2i& offset, cons
 }
 
 void AbstractFramebuffer::readImplementationRobustness(const Vector2i& offset, const Vector2i& size, const ColorFormat format, const ColorType type, const std::size_t dataSize, GLvoid* const data) {
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES
     glReadnPixelsARB(offset.x(), offset.y(), size.x(), size.y(), GLenum(format), GLenum(type), dataSize, data);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glReadnPixelsEXT(offset.x(), offset.y(), size.x(), size.y(), GLenum(format), GLenum(type), dataSize, data);
     #else
     static_cast<void>(offset);
     static_cast<void>(size);
@@ -332,8 +348,7 @@ void AbstractFramebuffer::readImplementationRobustness(const Vector2i& offset, c
     static_cast<void>(type);
     static_cast<void>(dataSize);
     static_cast<void>(data);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glReadnPixelsEXT(offset.x(), offset.y(), size.x(), size.y(), GLenum(format), GLenum(type), data);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 

src/Magnum/AbstractObject.cpp

@@ -36,6 +36,7 @@
 
 namespace Magnum {
 
+#if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
 namespace {
     inline GLenum extTypeFromKhrIdentifier(GLenum khrIdentifier) {
         switch(khrIdentifier) {
@@ -106,6 +107,7 @@ namespace {
         CORRADE_ASSERT_UNREACHABLE();
     }
 }
+#endif
 
 Int AbstractObject::maxLabelLength() {
     if(!Context::current()->isExtensionSupported<Extensions::GL::KHR::debug>())
@@ -127,28 +129,27 @@ Int AbstractObject::maxLabelLength() {
 void AbstractObject::labelImplementationNoOp(GLenum, GLuint, Containers::ArrayReference<const char>) {}
 
 void AbstractObject::labelImplementationKhr(const GLenum identifier, const GLuint name, const Containers::ArrayReference<const char> label) {
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES
     glObjectLabel(identifier, name, label.size(), label);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glObjectLabelKHR(identifier, name, label.size(), label);
     #else
     static_cast<void>(identifier);
     static_cast<void>(name);
     static_cast<void>(label);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glObjectLabelKHR(identifier, name, label.size(), label);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
 void AbstractObject::labelImplementationExt(const GLenum identifier, const GLuint name, const Containers::ArrayReference<const char> label) {
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
     const GLenum type = extTypeFromKhrIdentifier(identifier);
-    /** @todo Re-enable when extension loader is available for ES */
-    #ifndef MAGNUM_TARGET_GLES
     glLabelObjectEXT(type, name, label.size(), label);
     #else
-    static_cast<void>(type);
+    static_cast<void>(identifier);
     static_cast<void>(name);
     static_cast<void>(label);
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -157,24 +158,25 @@ std::string AbstractObject::getLabelImplementationNoOp(GLenum, GLuint) { return
 std::string AbstractObject::getLabelImplementationKhr(const GLenum identifier, const GLuint name) {
     /* Get label size (w/o null terminator) */
     GLsizei size;
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES
     glGetObjectLabel(identifier, name, 0, &size, nullptr);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glGetObjectLabelKHR(identifier, name, 0, &size, nullptr);
     #else
     static_cast<void>(identifier);
     static_cast<void>(name);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glGetObjectLabelKHR(identifier, name, 0, &size, nullptr);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 
     /* Make place also for the null terminator */
     std::string label;
     label.resize(size+1);
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES
     glGetObjectLabel(identifier, name, size+1, nullptr, &label[0]);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glGetObjectLabelKHR(identifier, name, size+1, nullptr, &label[0]);
     #else
-    //glGetObjectLabelKHR(identifier, name, size+1, nullptr, &label[0]);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 
     /* Pop null terminator and return the string */
@@ -183,25 +185,25 @@ std::string AbstractObject::getLabelImplementationKhr(const GLenum identifier, c
 }
 
 std::string AbstractObject::getLabelImplementationExt(const GLenum identifier, const GLuint name) {
-    const GLenum type = extTypeFromKhrIdentifier(identifier);
+    GLsizei size;
 
     /* Get label size (w/o null terminator) */
-    GLsizei size;
-    /** @todo Re-enable when extension loader is available for ES */
-    #ifndef MAGNUM_TARGET_GLES
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    const GLenum type = extTypeFromKhrIdentifier(identifier);
     glGetObjectLabelEXT(type, name, 0, &size, nullptr);
     #else
-    static_cast<void>(type);
+    static_cast<void>(identifier);
     static_cast<void>(name);
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 
     /* Make place also for the null terminator */
     std::string label;
     label.resize(size+1);
-    /** @todo Re-enable when extension loader is available for ES */
-    #ifndef MAGNUM_TARGET_GLES
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
     glGetObjectLabelEXT(identifier, name, size+1, nullptr, &label[0]);
+    #else
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 
     /* Pop null terminator and return the string */

src/Magnum/AbstractShaderProgram.cpp

@@ -52,9 +52,13 @@ Int AbstractShaderProgram::maxVertexAttributes() {
     return value;
 }
 
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 Int AbstractShaderProgram::maxAtomicCounterBufferSize() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_atomic_counters>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().shaderProgram->maxAtomicCounterBufferSize;
@@ -66,7 +70,11 @@ Int AbstractShaderProgram::maxAtomicCounterBufferSize() {
 }
 
 Int AbstractShaderProgram::maxComputeSharedMemorySize() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::compute_shader>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().shaderProgram->maxComputeSharedMemorySize;
@@ -78,7 +86,11 @@ Int AbstractShaderProgram::maxComputeSharedMemorySize() {
 }
 
 Int AbstractShaderProgram::maxComputeWorkGroupInvocations() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::compute_shader>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().shaderProgram->maxComputeWorkGroupInvocations;
@@ -90,7 +102,11 @@ Int AbstractShaderProgram::maxComputeWorkGroupInvocations() {
 }
 
 Int AbstractShaderProgram::maxImageUnits() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_image_load_store>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().shaderProgram->maxImageUnits;
@@ -100,7 +116,9 @@ Int AbstractShaderProgram::maxImageUnits() {
 
     return value;
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES
 Int AbstractShaderProgram::maxImageSamples() {
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_image_load_store>())
         return 0;
@@ -112,9 +130,15 @@ Int AbstractShaderProgram::maxImageSamples() {
 
     return value;
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES2
 Int AbstractShaderProgram::maxCombinedShaderOutputResources() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_storage_buffer_object>() || !Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_image_load_store>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().shaderProgram->maxCombinedShaderOutputResources;
@@ -126,7 +150,11 @@ Int AbstractShaderProgram::maxCombinedShaderOutputResources() {
 }
 
 Long AbstractShaderProgram::maxShaderStorageBlockSize() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_storage_buffer_object>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint64& value = Context::current()->state().shaderProgram->maxShaderStorageBlockSize;
@@ -154,9 +182,13 @@ Int AbstractShaderProgram::maxUniformBlockSize() {
 }
 #endif
 
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 Int AbstractShaderProgram::maxUniformLocations() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::explicit_uniform_location>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().shaderProgram->maxUniformLocations;
@@ -376,15 +408,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const GLfloat* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniform1fv(_id, location, count, values);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniform1fvEXT(_id, location, count, values);
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniform1fvEXT(_id, location, count, values);
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -404,15 +436,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::Vector<2, GLfloat>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniform2fv(_id, location, count, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniform2fvEXT(_id, location, count, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniform2fvEXT(_id, location, count, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -432,15 +464,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::Vector<3, GLfloat>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniform3fv(_id, location, count, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniform3fvEXT(_id, location, count, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniform3fvEXT(_id, location, count, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -460,15 +492,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::Vector<4, GLfloat>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniform4fv(_id, location, count, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniform4fvEXT(_id, location, count, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniform4fvEXT(_id, location, count, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -488,15 +520,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const GLint* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniform1iv(_id, location, count, values);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniform1ivEXT(_id, location, count, values);
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniform1ivEXT(_id, location, count, values);
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -516,15 +548,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::Vector<2, GLint>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniform2iv(_id, location, count, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniform2ivEXT(_id, location, count, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniform2ivEXT(_id, location, count, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -544,15 +576,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::Vector<3, GLint>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniform3iv(_id, location, count, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniform3ivEXT(_id, location, count, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniform3ivEXT(_id, location, count, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -572,15 +604,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::Vector<4, GLint>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniform4iv(_id, location, count, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniform4ivEXT(_id, location, count, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniform4ivEXT(_id, location, count, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -601,15 +633,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const GLuint* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniform1uiv(_id, location, count, values);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniform1uivEXT(_id, location, count, values);
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniform1uivEXT(_id, location, count, values);
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -629,15 +661,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::Vector<2, GLuint>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniform2uiv(_id, location, count, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniform2uivEXT(_id, location, count, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniform2uivEXT(_id, location, count, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -657,15 +689,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::Vector<3, GLuint>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniform3uiv(_id, location, count, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniform3uivEXT(_id, location, count, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniform3uivEXT(_id, location, count, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -685,15 +717,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::Vector<4, GLuint>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniform4uiv(_id, location, count, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniform4uivEXT(_id, location, count, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniform4uivEXT(_id, location, count, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -784,15 +816,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::RectangularMatrix<2, 2, GLfloat>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniformMatrix2fv(_id, location, count, GL_FALSE, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniformMatrix2fvEXT(_id, location, count, GL_FALSE, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniformMatrix2fvEXT(_id, location, count, GL_FALSE, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -812,15 +844,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::RectangularMatrix<3, 3, GLfloat>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniformMatrix3fv(_id, location, count, GL_FALSE, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniformMatrix3fvEXT(_id, location, count, GL_FALSE, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniformMatrix3fvEXT(_id, location, count, GL_FALSE, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -840,15 +872,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::RectangularMatrix<4, 4, GLfloat>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniformMatrix4fv(_id, location, count, GL_FALSE, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniformMatrix4fvEXT(_id, location, count, GL_FALSE, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniformMatrix4fvEXT(_id, location, count, GL_FALSE, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -869,15 +901,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::RectangularMatrix<2, 3, GLfloat>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniformMatrix2x3fv(_id, location, count, GL_FALSE, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniformMatrix2x3fvEXT(_id, location, count, GL_FALSE, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniformMatrix2x3fvEXT(_id, location, count, GL_FALSE, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -897,15 +929,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::RectangularMatrix<3, 2, GLfloat>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniformMatrix3x2fv(_id, location, count, GL_FALSE, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniformMatrix3x2fv(_id, location, count, GL_FALSE, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniformMatrix3x2fv(_id, location, count, GL_FALSE, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -925,15 +957,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::RectangularMatrix<2, 4, GLfloat>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniformMatrix2x4fv(_id, location, count, GL_FALSE, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniformMatrix2x4fvEXT(_id, location, count, GL_FALSE, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniformMatrix2x4fvEXT(_id, location, count, GL_FALSE, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -953,15 +985,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::RectangularMatrix<4, 2, GLfloat>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniformMatrix4x2fv(_id, location, count, GL_FALSE, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniformMatrix4x2fvEXT(_id, location, count, GL_FALSE, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniformMatrix4x2fvEXT(_id, location, count, GL_FALSE, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -981,15 +1013,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::RectangularMatrix<3, 4, GLfloat>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniformMatrix3x4fv(_id, location, count, GL_FALSE, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniformMatrix3x4fvEXT(_id, location, count, GL_FALSE, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniformMatrix3x4fvEXT(_id, location, count, GL_FALSE, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -1009,15 +1041,15 @@ void AbstractShaderProgram::uniformImplementationDefault(const GLint location, c
 }
 
 void AbstractShaderProgram::uniformImplementationSSO(const GLint location, const GLsizei count, const Math::RectangularMatrix<4, 3, GLfloat>* const values) {
-    /** @todo Enable when extension loader for ES is available */
     #ifndef MAGNUM_TARGET_GLES
     glProgramUniformMatrix4x3fv(_id, location, count, GL_FALSE, values[0].data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glProgramUniformMatrix4x3fvEXT(_id, location, count, GL_FALSE, values[0].data());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glProgramUniformMatrix4x3fvEXT(_id, location, count, GL_FALSE, values[0].data());
     static_cast<void>(location);
     static_cast<void>(count);
     static_cast<void>(values);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 

src/Magnum/AbstractShaderProgram.h

@@ -219,8 +219,8 @@ Int normalMatrixUniform = uniformLocation("normalMatrix");
 @requires_gl43 %Extension @extension{ARB,explicit_uniform_location} for
     explicit uniform location instead of using
     @ref Magnum::AbstractShaderProgram::uniformLocation() "uniformLocation()".
-@requires_gl Explicit uniform location is not supported in OpenGL ES. Use
-    @ref Magnum::AbstractShaderProgram::uniformLocation() "uniformLocation()"
+@requires_gles31 Explicit uniform location is not supported in OpenGL ES 3.0
+    and older. Use @ref Magnum::AbstractShaderProgram::uniformLocation() "uniformLocation()"
     instead.
 
 @anchor AbstractShaderProgram-texture-units
@@ -252,8 +252,8 @@ setUniform(uniformLocation("specularTexture"), 1);
 @requires_gl42 %Extension @extension{ARB,shading_language_420pack} for explicit
     texture binding unit instead of using
     @ref Magnum::AbstractShaderProgram::setUniform(Int, const T&) "setUniform(Int, Int)".
-@requires_gl Explicit texture binding unit is not supported in OpenGL ES. Use
-    @ref Magnum::AbstractShaderProgram::setUniform(Int, const T&) "setUniform(Int, Int)"
+@requires_gles31 Explicit texture binding unit is not supported in OpenGL ES
+    3.0 and older. Use @ref Magnum::AbstractShaderProgram::setUniform(Int, const T&) "setUniform(Int, Int)"
     instead.
 
 @anchor AbstractShaderProgram-rendering-workflow
@@ -352,15 +352,15 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
          */
         static Int maxVertexAttributes();
 
-        #ifndef MAGNUM_TARGET_GLES
+        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @brief Max supported atomic counter buffer size
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_atomic_counters} is
-         * not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_atomic_counters}
+         * (part of OpenGL 4.2) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_ATOMIC_COUNTER_BUFFER_SIZE}
-         * @requires_gl Atomic counters are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxAtomicCounterBufferSize();
 
@@ -368,10 +368,10 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
          * @brief Max supported compute shared memory size
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,compute_shader} is not
-         * available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,compute_shader}
+         * (part of OpenGL 4.3) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_COMPUTE_SHARED_MEMORY_SIZE}
-         * @requires_gl Compute shaders are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxComputeSharedMemorySize();
 
@@ -379,10 +379,10 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
          * @brief Max supported compute work group invocation count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,compute_shader} is not
-         * available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,compute_shader}
+         * (part of OpenGL 4.3) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_COMPUTE_WORK_GROUP_INVOCATIONS}
-         * @requires_gl Compute shaders are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxComputeWorkGroupInvocations();
 
@@ -393,32 +393,37 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
          *
          * The result is cached, repeated queries don't result in repeated
          * OpenGL calls. If extension @extension{ARB,shader_image_load_store}
-         * is not available, returns `0`.
+         * (part of OpenGL 4.2) or OpenGL ES 3.1 is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_IMAGE_UNITS}
-         * @requires_gl %Image load/store is not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxImageUnits();
+        #endif
 
+        #ifndef MAGNUM_TARGET_GLES
         /**
          * @brief Max supported image sample count
          *
          * The result is cached, repeated queries don't result in repeated
          * OpenGL calls. If extension @extension{ARB,shader_image_load_store}
-         * is not available, returns `0`.
+         * (part of OpenGL 4.2) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_IMAGE_SAMPLES}
-         * @requires_gl %Image load/store is not available in OpenGL ES.
+         * @requires_gl Multisample image load/store is not available in OpenGL
+         *      ES.
          */
         static Int maxImageSamples();
+        #endif
 
+        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @brief Max supported combined shader output resource count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If neither @extension{ARB,shader_image_load_store}
-         * nor @extension{ARB,shader_storage_buffer_object} extension is
-         * available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_image_load_store}
+         * (part of OpenGL 4.2) nor extension @extension{ARB,shader_storage_buffer_object}
+         * (part of OpenGL 4.3) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_COMBINED_SHADER_OUTPUT_RESOURCES}
-         * @requires_gl %Image load/store is not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxCombinedShaderOutputResources();
 
@@ -426,50 +431,44 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
          * @brief Max supported shader storage block size
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_storage_buffer_object}
-         * is not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_storage_buffer_object}
+         * (part of OpenGL 4.3) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_SHADER_STORAGE_BLOCK_SIZE}
-         * @requires_gl %Shader storage is not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Long maxShaderStorageBlockSize();
-        #endif
 
-        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @brief Max supported uniform block size
          *
          * The result is cached, repeated queries don't result in repeated
          * OpenGL calls. If extension @extension{ARB,uniform_buffer_object}
-         * is not available, returns `0`.
+         * (part of OpenGL 3.1) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_UNIFORM_BLOCK_SIZE}
-         * @requires_gles30 Uniform blocks are not available in OpenGL ES 2.0.
+         * @requires_gles30 Uniform blocks are not available in OpenGL ES 2.0
          */
         static Int maxUniformBlockSize();
-        #endif
 
-        #ifndef MAGNUM_TARGET_GLES
         /**
          * @brief Max supported explicit uniform location count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,explicit_uniform_location}
-         * is not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,explicit_uniform_location}
+         * (part of OpenGL 4.3) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_UNIFORM_LOCATIONS}
-         * @requires_gl Explicit uniform location is not supported in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxUniformLocations();
-        #endif
 
-        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @brief Min supported program texel offset
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{EXT,gpu_shader4} is not
-         * available, returns `0`.
+         * OpenGL calls. If extension @extension{EXT,gpu_shader4} (part of
+         * OpenGL 3.0) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MIN_PROGRAM_TEXEL_OFFSET}
          * @requires_gles30 %Texture lookup with offset is not available in
-         *      OpenGL ES 2.0.
+         *      OpenGL ES 2.0
          */
         static Int minTexelOffset();
 
@@ -477,11 +476,11 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
          * @brief Max supported program texel offset
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{EXT,gpu_shader4} is not
-         * available, returns `0`.
+         * OpenGL calls. If extension @extension{EXT,gpu_shader4} (part of
+         * OpenGL 3.0) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_PROGRAM_TEXEL_OFFSET}
          * @requires_gles30 %Texture lookup with offset is not available in
-         *      OpenGL ES 2.0.
+         *      OpenGL ES 2.0
          */
         static Int maxTexelOffset();
         #endif

src/Magnum/AbstractTexture.cpp

@@ -62,9 +62,13 @@ Float AbstractTexture::maxLodBias() {
 }
 #endif
 
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 Int AbstractTexture::maxColorSamples() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().texture->maxColorSamples;
@@ -77,7 +81,11 @@ Int AbstractTexture::maxColorSamples() {
 }
 
 Int AbstractTexture::maxDepthSamples() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().texture->maxDepthSamples;
@@ -90,7 +98,11 @@ Int AbstractTexture::maxDepthSamples() {
 }
 
 Int AbstractTexture::maxIntegerSamples() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().texture->maxIntegerSamples;
@@ -327,7 +339,7 @@ void AbstractTexture::setCompareFunction(const Sampler::CompareFunction function
         , GLenum(function));
 }
 
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 void AbstractTexture::setDepthStencilMode(const Sampler::DepthStencilMode mode) {
     (this->*Context::current()->state().texture->parameteriImplementation)(GL_DEPTH_STENCIL_TEXTURE_MODE, GLenum(mode));
 }
@@ -818,16 +830,18 @@ void AbstractTexture::setMaxAnisotropyImplementationExt(GLfloat anisotropy) {
     (this->*Context::current()->state().texture->parameterfImplementation)(GL_TEXTURE_MAX_ANISOTROPY_EXT, anisotropy);
 }
 
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 void AbstractTexture::getLevelParameterImplementationDefault(GLenum target, GLint level, GLenum parameter, GLint* values) {
     bindInternal();
     glGetTexLevelParameteriv(target, level, parameter, values);
 }
 
+#ifndef MAGNUM_TARGET_GLES
 void AbstractTexture::getLevelParameterImplementationDSA(GLenum target, GLint level, GLenum parameter, GLint* values) {
     glGetTextureLevelParameterivEXT(_id, target, level, parameter, values);
 }
 #endif
+#endif
 
 #ifndef MAGNUM_TARGET_GLES
 void AbstractTexture::storageImplementationFallback(const GLenum target, const GLsizei levels, const TextureFormat internalFormat, const Math::Vector<1, GLsizei>& size) {
@@ -895,16 +909,16 @@ void AbstractTexture::storageImplementationFallback(const GLenum target, const G
 
 void AbstractTexture::storageImplementationDefault(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector2i& size) {
     bindInternal();
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES2
     glTexStorage2D(target, levels, GLenum(internalFormat), size.x(), size.y());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glTexStorage2DEXT(target, levels, GLenum(internalFormat), size.x(), size.y());
     #else
     static_cast<void>(target);
     static_cast<void>(levels);
     static_cast<void>(internalFormat);
     static_cast<void>(size);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glTexStorage2DEXT(target, levels, GLenum(internalFormat), size.x(), size.y());
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -949,16 +963,16 @@ void AbstractTexture::storageImplementationFallback(GLenum target, GLsizei level
 
 void AbstractTexture::storageImplementationDefault(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector3i& size) {
     bindInternal();
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES2
     glTexStorage3D(target, levels, GLenum(internalFormat), size.x(), size.y(), size.z());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glTexStorage3DEXT(target, levels, GLenum(internalFormat), size.x(), size.y(), size.z());
     #else
     static_cast<void>(target);
     static_cast<void>(levels);
     static_cast<void>(internalFormat);
     static_cast<void>(size);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glTexStorage3DEXT(target, levels, GLenum(internalFormat), size.x(), size.y(), size.z());
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -973,12 +987,16 @@ void AbstractTexture::storageMultisampleImplementationFallback(const GLenum targ
     bindInternal();
     glTexImage2DMultisample(target, samples, GLenum(internalFormat), size.x(), size.y(), fixedSampleLocations);
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES2
 void AbstractTexture::storageMultisampleImplementationDefault(const GLenum target, const GLsizei samples, const TextureFormat internalFormat, const Vector2i& size, const GLboolean fixedSampleLocations) {
     bindInternal();
     glTexStorage2DMultisample(target, samples, GLenum(internalFormat), size.x(), size.y(), fixedSampleLocations);
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES
 void AbstractTexture::storageMultisampleImplementationDSA(const GLenum target, const GLsizei samples, const TextureFormat internalFormat, const Vector2i& size, const GLboolean fixedSampleLocations) {
     glTextureStorage2DMultisampleEXT(_id, target, samples, GLenum(internalFormat), size.x(), size.y(), fixedSampleLocations);
 }
@@ -1038,9 +1056,10 @@ void AbstractTexture::imageImplementationDSA(GLenum target, GLint level, Texture
 
 void AbstractTexture::imageImplementationDefault(GLenum target, GLint level, TextureFormat internalFormat, const Vector3i& size, ColorFormat format, ColorType type, const GLvoid* data) {
     bindInternal();
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES2
     glTexImage3D(target, level, GLint(internalFormat), size.x(), size.y(), size.z(), 0, GLenum(format), GLenum(type), data);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glTexImage3DOES(target, level, GLint(internalFormat), size.x(), size.y(), size.z(), 0, GLenum(format), GLenum(type), data);
     #else
     static_cast<void>(target);
     static_cast<void>(level);
@@ -1049,8 +1068,7 @@ void AbstractTexture::imageImplementationDefault(GLenum target, GLint level, Tex
     static_cast<void>(format);
     static_cast<void>(type);
     static_cast<void>(data);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glTexImage3DOES(target, level, GLint(internalFormat), size.x(), size.y(), size.z(), 0, GLenum(format), GLenum(type), data);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -1084,9 +1102,10 @@ void AbstractTexture::subImageImplementationDSA(GLenum target, GLint level, cons
 
 void AbstractTexture::subImageImplementationDefault(GLenum target, GLint level, const Vector3i& offset, const Vector3i& size, ColorFormat format, ColorType type, const GLvoid* data) {
     bindInternal();
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES2
     glTexSubImage3D(target, level, offset.x(), offset.y(), offset.z(), size.x(), size.y(), size.z(), GLenum(format), GLenum(type), data);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glTexSubImage3DOES(target, level, offset.x(), offset.y(), offset.z(), size.x(), size.y(), size.z(), GLenum(format), GLenum(type), data);
     #else
     static_cast<void>(target);
     static_cast<void>(level);
@@ -1095,8 +1114,7 @@ void AbstractTexture::subImageImplementationDefault(GLenum target, GLint level,
     static_cast<void>(format);
     static_cast<void>(type);
     static_cast<void>(data);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glTexSubImage3DOES(target, level, offset.x(), offset.y(), offset.z(), size.x(), size.y(), size.z(), GLenum(format), GLenum(type), data);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -1159,7 +1177,9 @@ Math::Vector<1, GLint> AbstractTexture::DataHelper<1>::imageSize(AbstractTexture
     (texture.*Context::current()->state().texture->getLevelParameterivImplementation)(target, level, GL_TEXTURE_WIDTH, &value[0]);
     return value;
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES2
 Vector2i AbstractTexture::DataHelper<2>::imageSize(AbstractTexture& texture, const GLenum target, const GLint level) {
     const Implementation::TextureState& state = *Context::current()->state().texture;
 
@@ -1194,11 +1214,13 @@ void AbstractTexture::DataHelper<3>::setStorage(AbstractTexture& texture, const
     (texture.*Context::current()->state().texture->storage3DImplementation)(target, levels, internalFormat, size);
 }
 
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 void AbstractTexture::DataHelper<2>::setStorageMultisample(AbstractTexture& texture, const GLenum target, const GLsizei samples, const TextureFormat internalFormat, const Vector2i& size, const GLboolean fixedSampleLocations) {
     (texture.*Context::current()->state().texture->storage2DMultisampleImplementation)(target, samples, internalFormat, size, fixedSampleLocations);
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES
 void AbstractTexture::DataHelper<3>::setStorageMultisample(AbstractTexture& texture, const GLenum target, const GLsizei samples, const TextureFormat internalFormat, const Vector3i& size, const GLboolean fixedSampleLocations) {
     (texture.*Context::current()->state().texture->storage3DMultisampleImplementation)(target, samples, internalFormat, size, fixedSampleLocations);
 }

src/Magnum/AbstractTexture.h

@@ -159,15 +159,15 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
         static Float maxLodBias();
         #endif
 
-        #ifndef MAGNUM_TARGET_GLES
+        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @brief Max supported color sample count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,texture_multisample} is
-         * not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,texture_multisample}
+         * (part of OpenGL 3.2) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_COLOR_TEXTURE_SAMPLES}
-         * @requires_gl Multisample textures are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxColorSamples();
 
@@ -175,10 +175,10 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
          * @brief Max supported depth sample count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,texture_multisample} is
-         * not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,texture_multisample}
+         * (part of OpenGL 3.2) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_DEPTH_TEXTURE_SAMPLES}
-         * @requires_gl Multisample textures are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxDepthSamples();
 
@@ -186,10 +186,10 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
          * @brief Max supported integer sample count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,texture_multisample} is
-         * not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,texture_multisample}
+         * (part of OpenGL 3.2) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_INTEGER_SAMPLES}
-         * @requires_gl Multisample textures are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxIntegerSamples();
         #endif
@@ -341,7 +341,7 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
 
         void setCompareMode(Sampler::CompareMode mode);
         void setCompareFunction(Sampler::CompareFunction function);
-        #ifndef MAGNUM_TARGET_GLES
+        #ifndef MAGNUM_TARGET_GLES2
         void setDepthStencilMode(Sampler::DepthStencilMode mode);
         #endif
         void invalidateImage(Int level);
@@ -394,10 +394,12 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
         void MAGNUM_LOCAL setMaxAnisotropyImplementationNoOp(GLfloat);
         void MAGNUM_LOCAL setMaxAnisotropyImplementationExt(GLfloat anisotropy);
 
-        #ifndef MAGNUM_TARGET_GLES
+        #ifndef MAGNUM_TARGET_GLES2
         void MAGNUM_LOCAL getLevelParameterImplementationDefault(GLenum target, GLint level, GLenum parameter, GLint* values);
+        #ifndef MAGNUM_TARGET_GLES
         void MAGNUM_LOCAL getLevelParameterImplementationDSA(GLenum target, GLint level, GLenum parameter, GLint* values);
         #endif
+        #endif
 
         void MAGNUM_LOCAL mipmapImplementationDefault();
         #ifndef MAGNUM_TARGET_GLES
@@ -424,9 +426,15 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
 
         #ifndef MAGNUM_TARGET_GLES
         void MAGNUM_LOCAL storageMultisampleImplementationFallback(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector2i& size, GLboolean fixedsamplelocations);
+        #endif
+        #ifndef MAGNUM_TARGET_GLES2
         void MAGNUM_LOCAL storageMultisampleImplementationDefault(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector2i& size, GLboolean fixedsamplelocations);
+        #endif
+        #ifndef MAGNUM_TARGET_GLES
         void MAGNUM_LOCAL storageMultisampleImplementationDSA(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector2i& size, GLboolean fixedsamplelocations);
+        #endif
 
+        #ifndef MAGNUM_TARGET_GLES
         void MAGNUM_LOCAL storageMultisampleImplementationFallback(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector3i& size, GLboolean fixedsamplelocations);
         void MAGNUM_LOCAL storageMultisampleImplementationDefault(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector3i& size, GLboolean fixedsamplelocations);
         void MAGNUM_LOCAL storageMultisampleImplementationDSA(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector3i& size, GLboolean fixedsamplelocations);
@@ -520,7 +528,7 @@ template<> struct MAGNUM_EXPORT AbstractTexture::DataHelper<2> {
     };
     #endif
 
-    #ifndef MAGNUM_TARGET_GLES
+    #ifndef MAGNUM_TARGET_GLES2
     static Vector2i imageSize(AbstractTexture& texture, GLenum target, GLint level);
     #endif
 
@@ -528,7 +536,9 @@ template<> struct MAGNUM_EXPORT AbstractTexture::DataHelper<2> {
 
     static void setStorage(AbstractTexture& texture, GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector2i& size);
 
+    #ifndef MAGNUM_TARGET_GLES2
     static void setStorageMultisample(AbstractTexture& texture, GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector2i& size, GLboolean fixedSampleLocations);
+    #endif
 
     static void setImage(AbstractTexture& texture, GLenum target, GLint level, TextureFormat internalFormat, const ImageReference2D& image);
     #ifndef MAGNUM_TARGET_GLES2
@@ -557,7 +567,7 @@ template<> struct MAGNUM_EXPORT AbstractTexture::DataHelper<3> {
     };
     #endif
 
-    #ifndef MAGNUM_TARGET_GLES
+    #ifndef MAGNUM_TARGET_GLES2
     static Vector3i imageSize(AbstractTexture& texture, GLenum target, GLint level);
     #endif
 
@@ -565,7 +575,9 @@ template<> struct MAGNUM_EXPORT AbstractTexture::DataHelper<3> {
 
     static void setStorage(AbstractTexture& texture, GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector3i& size);
 
+    #ifndef MAGNUM_TARGET_GLES
     static void setStorageMultisample(AbstractTexture& texture, GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector3i& size, GLboolean fixedSampleLocations);
+    #endif
 
     static void setImage(AbstractTexture& texture, GLenum target, GLint level, TextureFormat internalFormat, const ImageReference3D& image);
     #ifndef MAGNUM_TARGET_GLES2

src/Magnum/Buffer.cpp

@@ -48,9 +48,15 @@ Int Buffer::minMapAlignment() {
 
     return value;
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES2
 Int Buffer::maxAtomicCounterBindings() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_atomic_counters>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().buffer->maxAtomicCounterBindings;
@@ -62,7 +68,11 @@ Int Buffer::maxAtomicCounterBindings() {
 }
 
 Int Buffer::maxShaderStorageBindings() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_storage_buffer_object>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().buffer->maxShaderStorageBindings;
@@ -74,7 +84,11 @@ Int Buffer::maxShaderStorageBindings() {
 }
 
 Int Buffer::shaderStorageOffsetAlignment() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_storage_buffer_object>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().buffer->shaderStorageOffsetAlignment;
@@ -212,15 +226,14 @@ void* Buffer::map(const MapAccess access) {
 
 #ifdef MAGNUM_TARGET_GLES2
 void* Buffer::mapSub(const GLintptr offset, const GLsizeiptr length, const MapAccess access) {
-    /** @todo Enable also in Emscripten (?) when extension loader is available */
     #ifdef CORRADE_TARGET_NACL
     CORRADE_ASSERT(!_mappedBuffer, "Buffer::mapSub(): the buffer is already mapped", nullptr);
     return _mappedBuffer = glMapBufferSubDataCHROMIUM(GLenum(bindInternal(_targetHint)), offset, length, GLenum(access));
     #else
-    CORRADE_INTERNAL_ASSERT(false);
     static_cast<void>(offset);
     static_cast<void>(length);
     static_cast<void>(access);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 #endif
@@ -238,13 +251,12 @@ bool Buffer::unmap() { return (this->*Context::current()->state().buffer->unmapI
 
 #ifdef MAGNUM_TARGET_GLES2
 void Buffer::unmapSub() {
-    /** @todo Enable also in Emscripten (?) when extension loader is available */
     #ifdef CORRADE_TARGET_NACL
     CORRADE_ASSERT(_mappedBuffer, "Buffer::unmapSub(): the buffer is not mapped", );
     glUnmapBufferSubDataCHROMIUM(_mappedBuffer);
     _mappedBuffer = nullptr;
     #else
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 #endif
@@ -324,13 +336,13 @@ void Buffer::invalidateSubImplementationARB(GLintptr offset, GLsizeiptr length)
 #endif
 
 void* Buffer::mapImplementationDefault(MapAccess access) {
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES
     return glMapBuffer(GLenum(bindInternal(_targetHint)), GLenum(access));
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    return glMapBufferOES(GLenum(bindInternal(_targetHint)), GLenum(access));
     #else
     static_cast<void>(access);
-    CORRADE_INTERNAL_ASSERT(false);
-    //return glMapBufferOES(GLenum(bindInternal(_targetHint)), GLenum(access));
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -341,15 +353,15 @@ void* Buffer::mapImplementationDSA(MapAccess access) {
 #endif
 
 void* Buffer::mapRangeImplementationDefault(GLintptr offset, GLsizeiptr length, MapFlags access) {
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES2
     return glMapBufferRange(GLenum(bindInternal(_targetHint)), offset, length, GLenum(access));
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    return glMapBufferRangeEXT(GLenum(bindInternal(_targetHint)), offset, length, GLenum(access));
     #else
     static_cast<void>(offset);
     static_cast<void>(length);
     static_cast<void>(access);
-    CORRADE_INTERNAL_ASSERT(false);
-    //return glMapBufferRangeEXT(GLenum(bindInternal(_targetHint)), offset, length, GLenum(access));
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -360,14 +372,14 @@ void* Buffer::mapRangeImplementationDSA(GLintptr offset, GLsizeiptr length, MapF
 #endif
 
 void Buffer::flushMappedRangeImplementationDefault(GLintptr offset, GLsizeiptr length) {
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES2
     glFlushMappedBufferRange(GLenum(bindInternal(_targetHint)), offset, length);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glFlushMappedBufferRangeEXT(GLenum(bindInternal(_targetHint)), offset, length);
     #else
     static_cast<void>(offset);
     static_cast<void>(length);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glFlushMappedBufferRangeEXT(GLenum(bindInternal(_targetHint)), offset, length);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -378,12 +390,12 @@ void Buffer::flushMappedRangeImplementationDSA(GLintptr offset, GLsizeiptr lengt
 #endif
 
 bool Buffer::unmapImplementationDefault() {
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES2
     return glUnmapBuffer(GLenum(bindInternal(_targetHint)));
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    return glUnmapBufferOES(GLenum(bindInternal(_targetHint)));
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //return glUnmapBufferOES(GLenum(bindInternal(_targetHint)));
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -398,14 +410,10 @@ Debug operator<<(Debug debug, Buffer::Target value) {
     switch(value) {
         #define _c(value) case Buffer::Target::value: return debug << "Buffer::Target::" #value;
         _c(Array)
-        #ifndef MAGNUM_TARGET_GLES
-        _c(AtomicCounter)
-        #endif
         #ifndef MAGNUM_TARGET_GLES2
+        _c(AtomicCounter)
         _c(CopyRead)
         _c(CopyWrite)
-        #endif
-        #ifndef MAGNUM_TARGET_GLES
         _c(DispatchIndirect)
         _c(DrawIndirect)
         #endif
@@ -413,9 +421,9 @@ Debug operator<<(Debug debug, Buffer::Target value) {
         #ifndef MAGNUM_TARGET_GLES2
         _c(PixelPack)
         _c(PixelUnpack)
+        _c(ShaderStorage)
         #endif
         #ifndef MAGNUM_TARGET_GLES
-        _c(ShaderStorage)
         _c(Texture)
         #endif
         #ifndef MAGNUM_TARGET_GLES2

src/Magnum/Buffer.h

@@ -219,11 +219,12 @@ class MAGNUM_EXPORT Buffer: public AbstractObject {
             /** Used for storing vertex attributes. */
             Array = GL_ARRAY_BUFFER,
 
-            #ifndef MAGNUM_TARGET_GLES
+            #ifndef MAGNUM_TARGET_GLES2
             /**
              * Used for storing atomic counters.
              * @requires_gl42 %Extension @extension{ARB,shader_atomic_counters}
-             * @requires_gl Atomic counters are not available in OpenGL ES.
+             * @requires_gles31 Atomic counters are not available in OpenGL ES
+             *      3.0 and older.
              */
             AtomicCounter = GL_ATOMIC_COUNTER_BUFFER,
             #endif
@@ -246,18 +247,20 @@ class MAGNUM_EXPORT Buffer: public AbstractObject {
             CopyWrite = GL_COPY_WRITE_BUFFER,
             #endif
 
-            #ifndef MAGNUM_TARGET_GLES
+            #ifndef MAGNUM_TARGET_GLES2
             /**
              * Indirect compute dispatch commands.
              * @requires_gl43 %Extension @extension{ARB,compute_shader}
-             * @requires_gl Compute shaders are not available in OpenGL ES.
+             * @requires_gles31 Compute shaders are not available in OpenGL ES
+             *      3.0 and older.
              */
             DispatchIndirect = GL_DISPATCH_INDIRECT_BUFFER,
 
             /**
              * Used for supplying arguments for indirect drawing.
              * @requires_gl40 %Extension @extension{ARB,draw_indirect}
-             * @requires_gl Indirect drawing not available in OpenGL ES.
+             * @requires_gles31 Indirect drawing not available in OpenGL ES 3.0
+             *      and older.
              */
             DrawIndirect = GL_DRAW_INDIRECT_BUFFER,
             #endif
@@ -283,14 +286,17 @@ class MAGNUM_EXPORT Buffer: public AbstractObject {
             PixelUnpack = GL_PIXEL_UNPACK_BUFFER,
             #endif
 
-            #ifndef MAGNUM_TARGET_GLES
+            #ifndef MAGNUM_TARGET_GLES2
             /**
              * Used for shader storage.
              * @requires_gl43 %Extension @extension{ARB,shader_storage_buffer_object}
-             * @requires_gl Shader storage is not available in OpenGL ES.
+             * @requires_gles31 Shader storage is not available in OpenGL ES
+             *      3.0 and older.
              */
             ShaderStorage = GL_SHADER_STORAGE_BUFFER,
+            #endif
 
+            #ifndef MAGNUM_TARGET_GLES
             /**
              * Source for texel fetches. See @ref BufferTexture.
              * @requires_gl31 %Extension @extension{ARB,texture_buffer_object}
@@ -442,21 +448,23 @@ class MAGNUM_EXPORT Buffer: public AbstractObject {
          * @brief Minimal supported mapping alignment
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,map_buffer_alignment} is
-         * not available, returns `0`.
+         * OpenGL calls. If extension @extension{ARB,map_buffer_alignment}
+         * (part of OpenGL 4.2) is not available, returns `0`.
          * @see @ref map(), @fn_gl{Get} with @def_gl{MIN_MAP_BUFFER_ALIGNMENT}
          * @requires_gl No minimal value is specified for OpenGL ES.
          */
         static Int minMapAlignment();
+        #endif
 
+        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @brief Max supported atomic counter buffer binding count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_atomic_counters} is
-         * not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_atomic_counters}
+         * (part of OpenGL 4.2) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_ATOMIC_COUNTER_BUFFER_BINDINGS}
-         * @requires_gl Atomic counters are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxAtomicCounterBindings();
 
@@ -464,10 +472,10 @@ class MAGNUM_EXPORT Buffer: public AbstractObject {
          * @brief Max supported shader storage buffer binding count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_storage_buffer_object}
-         * is not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_storage_buffer_object}
+         * (part of OpenGL 4.3) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_SHADER_STORAGE_BUFFER_BINDINGS}
-         * @requires_gl Atomic counters are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxShaderStorageBindings();
 
@@ -475,10 +483,10 @@ class MAGNUM_EXPORT Buffer: public AbstractObject {
          * @brief Alignment of shader storage buffer binding offset
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_storage_buffer_object}
-         * is not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_storage_buffer_object}
+         * (part of OpenGL 4.3) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT}
-         * @requires_gl Atomic counters are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int shaderStorageOffsetAlignment();
         #endif
@@ -489,7 +497,7 @@ class MAGNUM_EXPORT Buffer: public AbstractObject {
          *
          * The result is cached, repeated queries don't result in repeated
          * OpenGL calls. If extension @extension{ARB,uniform_buffer_object}
-         * is not available, returns `0`.
+         * (part of OpenGL 3.1) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_UNIFORM_BUFFER_BINDINGS}
          * @requires_gles30 Uniform blocks are not available in OpenGL ES 2.0.
          */

src/Magnum/CMakeLists.txt

@@ -143,26 +143,30 @@ if(NOT TARGET_GLES)
     set(Magnum_HEADERS ${Magnum_HEADERS}
         BufferTexture.h
         CubeMapTextureArray.h
-        MultisampleTexture.h
         RectangleTexture.h)
     set(Magnum_SRCS ${Magnum_SRCS}
         BufferTexture.cpp
         CubeMapTextureArray.cpp
-        MultisampleTexture.cpp
-        RectangleTexture.cpp
-        $<TARGET_OBJECTS:MagnumFlextGLObjects>)
+        RectangleTexture.cpp)
 endif()
 
 # Non-ES2 stuff
 if(NOT TARGET_GLES2)
     set(Magnum_HEADERS ${Magnum_HEADERS}
         BufferImage.h
+        MultisampleTexture.h
         TextureArray.h)
     set(Magnum_SRCS ${Magnum_SRCS}
         BufferImage.cpp
+        MultisampleTexture.cpp
         TextureArray.cpp)
 endif()
 
+# Link in GL function pointer variables on platforms that support it
+if(NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_NACL)
+    list(APPEND Magnum_SRCS $<TARGET_OBJECTS:MagnumFlextGLObjects>)
+endif()
+
 # Files shared between main library and math unit test library
 set(MagnumMath_SRCS
     Math/Functions.cpp

src/Magnum/Context.cpp

@@ -281,6 +281,7 @@ const std::vector<Extension>& Extension::extensions(Version version) {
         #else
         case Version::GLES200: return empty;
         case Version::GLES300:
+        case Version::GLES310:
             #ifdef MAGNUM_TARGET_GLES2
             return extensionsES300;
             #else
@@ -396,6 +397,7 @@ Context::Context(void functionLoader()) {
         #else
         Version::GLES200,
         Version::GLES300,
+        Version::GLES310,
         #endif
         Version::None
     };

src/Magnum/CubeMapTexture.h

@@ -238,7 +238,7 @@ class MAGNUM_EXPORT CubeMapTexture: public AbstractTexture {
             return *this;
         }
 
-        #ifndef MAGNUM_TARGET_GLES
+        #ifndef MAGNUM_TARGET_GLES2
         /** @copydoc Texture::setDepthStencilMode() */
         CubeMapTexture& setDepthStencilMode(Sampler::DepthStencilMode mode) {
             AbstractTexture::setDepthStencilMode(mode);
@@ -246,14 +246,15 @@ class MAGNUM_EXPORT CubeMapTexture: public AbstractTexture {
         }
         #endif
 
-        #ifndef MAGNUM_TARGET_GLES
+        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @brief %Image size in given mip level
          * @param coordinate        Coordinate
          * @param level             Mip level
          *
          * See @ref Texture::imageSize() for more information.
-         * @requires_gl %Texture image queries are not available in OpenGL ES.
+         * @requires_gles31 %Texture image size queries are not available in
+         *      OpenGL ES 3.0 and older.
          */
         Vector2i imageSize(Coordinate coordinate, Int level) {
             return DataHelper<2>::imageSize(*this, GLenum(coordinate), level);

src/Magnum/DebugMessage.cpp

@@ -36,8 +36,7 @@ namespace Magnum {
 
 namespace {
 
-/** @todo Re-enable when extension wrangler is available for ES */
-#ifndef MAGNUM_TARGET_GLES
+#if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
 void
 #ifdef CORRADE_TARGET_WINDOWS
 APIENTRY
@@ -113,27 +112,26 @@ void DebugMessage::insertInternal(const Source source, const Type type, const Un
 void DebugMessage::insertImplementationNoOp(Source, Type, UnsignedInt, Severity, const Containers::ArrayReference<const char>) {}
 
 void DebugMessage::insertImplementationKhr(const Source source, const Type type, const UnsignedInt id, const Severity severity, const Containers::ArrayReference<const char> string) {
-    /** @todo Re-enable when extension wrangler is available for ES */
     #ifndef MAGNUM_TARGET_GLES
     glDebugMessageInsert(GLenum(source), GLenum(type), id, GLenum(severity), string.size(), string.data());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glDebugMessageInsertKHR(GLenum(source), GLenum(type), id, GLenum(severity), string.size(), string.data());
     #else
     static_cast<void>(source);
     static_cast<void>(type);
     static_cast<void>(id);
     static_cast<void>(severity);
     static_cast<void>(string);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glDebugMessageInsertEXT(GLenum(source), GLenum(type), id, GLenum(severity), string.size(), string.data());
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
 void DebugMessage::insertImplementationExt(Source, Type, UnsignedInt, Severity, const Containers::ArrayReference<const char> string) {
-    /** @todo Re-enable when extension wrangler is available for ES */
-    #ifndef MAGNUM_TARGET_GLES
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
     glInsertEventMarkerEXT(string.size(), string.data());
     #else
     static_cast<void>(string);
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -150,17 +148,17 @@ void DebugMessage::setEnabledInternal(const GLenum source, const GLenum type, co
 void DebugMessage::controlImplementationNoOp(GLenum, GLenum, GLenum, std::initializer_list<UnsignedInt>, bool) {}
 
 void DebugMessage::controlImplementationKhr(const GLenum source, const GLenum type, const GLenum severity, const std::initializer_list<UnsignedInt> ids, const bool enabled) {
-    /** @todo Re-enable when extension wrangler is available for ES */
     #ifndef MAGNUM_TARGET_GLES
     glDebugMessageControl(source, type, severity, ids.size(), ids.begin(), enabled);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glDebugMessageControlKHR(source, type, severity, ids.size(), ids.begin(), enabled);
     #else
     static_cast<void>(source);
     static_cast<void>(type);
     static_cast<void>(severity);
     static_cast<void>(ids);
     static_cast<void>(enabled);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glDebugMessageControlKHR(source, type, severity, ids.size(), ids.begin(), enabled);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -173,23 +171,23 @@ void DebugMessage::callbackImplementationKhr(const Callback callback, const void
 
     /* Adding callback */
     if(!original && callback) {
-        /** @todo Re-enable when extension wrangler is available for ES */
         #ifndef MAGNUM_TARGET_GLES
         glDebugMessageCallback(callbackWrapper, userParam);
+        #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+        glDebugMessageCallbackKHR(callbackWrapper, userParam);
         #else
         static_cast<void>(userParam);
-        CORRADE_INTERNAL_ASSERT(false);
-        //glDebugMessageCallbackEXT(callbackWrapper, userParam);
+        CORRADE_ASSERT_UNREACHABLE();
         #endif
 
     /* Deleting callback */
     } else if(original && !callback) {
-        /** @todo Re-enable when extension wrangler is available for ES */
         #ifndef MAGNUM_TARGET_GLES
         glDebugMessageCallback(nullptr, nullptr);
+        #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+        glDebugMessageCallbackKHR(nullptr, nullptr);
         #else
-        CORRADE_INTERNAL_ASSERT(false);
-        //glDebugMessageCallbackEXT(nullptr, nullptr);
+        CORRADE_ASSERT_UNREACHABLE();
         #endif
     }
 }

src/Magnum/Framebuffer.cpp

@@ -36,12 +36,12 @@
 
 #ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#include "Magnum/MultisampleTexture.h"
 #include "Magnum/TextureArray.h"
 #endif
 
 #ifndef MAGNUM_TARGET_GLES
 #include "Magnum/CubeMapTextureArray.h"
-#include "Magnum/MultisampleTexture.h"
 #include "Magnum/RectangleTexture.h"
 #endif
 
@@ -190,7 +190,9 @@ Framebuffer& Framebuffer::attachTexture(const BufferAttachment attachment, Recta
     (this->*Context::current()->state().framebuffer->texture2DImplementation)(attachment, GL_TEXTURE_RECTANGLE, texture.id(), 0);
     return *this;
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES2
 Framebuffer& Framebuffer::attachTexture(const BufferAttachment attachment, MultisampleTexture2D& texture) {
     (this->*Context::current()->state().framebuffer->texture2DImplementation)(attachment, GL_TEXTURE_2D_MULTISAMPLE, texture.id(), 0);
     return *this;
@@ -276,16 +278,16 @@ void Framebuffer::texture2DImplementationDSA(BufferAttachment attachment, GLenum
 #endif
 
 void Framebuffer::textureLayerImplementationDefault(BufferAttachment attachment, GLuint textureId, GLint mipLevel, GLint layer) {
-    /** @todo Re-enable when extension loader is available for ES 2.0 */
     #ifndef MAGNUM_TARGET_GLES2
     glFramebufferTextureLayer(GLenum(bindInternal()), GLenum(attachment), textureId, mipLevel, layer);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glFramebufferTexture3DOES(GLenum(bindInternal()), GLenum(attachment), GL_TEXTURE_3D_OES, textureId, mipLevel, layer);
     #else
     static_cast<void>(attachment);
     static_cast<void>(textureId);
     static_cast<void>(mipLevel);
     static_cast<void>(layer);
-    CORRADE_INTERNAL_ASSERT(false);
-    //glFramebufferTexture3DOES(GLenum(bindInternal()), GLenum(attachment), GL_TEXTURE_3D_OES, texture.id(), mipLevel, layer);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 

src/Magnum/Framebuffer.h

@@ -539,10 +539,13 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje
          * @requires_gl Rectangle textures are not available in OpenGL ES.
          */
         Framebuffer& attachTexture(BufferAttachment attachment, RectangleTexture& texture);
+        #endif
 
+        #ifndef MAGNUM_TARGET_GLES2
         /** @overload
          * @requires_gl32 %Extension @extension{ARB,texture_multisample}
-         * @requires_gl Multisample textures are not available in OpenGL ES.
+         * @requires_gles31 Multisample textures are not available in OpenGL ES
+         *      3.0 and older.
          */
         Framebuffer& attachTexture(BufferAttachment attachment, MultisampleTexture2D& texture);
         #endif
@@ -608,7 +611,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje
 
         /** @overload
          * @requires_gl32 %Extension @extension{ARB,texture_multisample}
-         * @requires_gl Multisample textures are not available in OpenGL ES.
+         * @requires_gl Multisample array textures are not available in OpenGL ES.
          */
         Framebuffer& attachTextureLayer(BufferAttachment attachment, MultisampleTexture2DArray& texture, Int layer);
         #endif

src/Magnum/Implementation/BufferState.cpp

@@ -36,24 +36,22 @@ namespace Magnum { namespace Implementation {
 
 const Buffer::Target BufferState::targetForIndex[] = {
     Buffer::Target::Array,
-    Buffer::Target::ElementArray
+    Buffer::Target::ElementArray,
     #ifndef MAGNUM_TARGET_GLES2
-    ,
     Buffer::Target::CopyRead,
     Buffer::Target::CopyWrite,
     Buffer::Target::PixelPack,
     Buffer::Target::PixelUnpack,
     Buffer::Target::TransformFeedback,
-    Buffer::Target::Uniform
-    #endif
-    #ifndef MAGNUM_TARGET_GLES
-    ,
+    Buffer::Target::Uniform,
     Buffer::Target::AtomicCounter,
     Buffer::Target::DispatchIndirect,
     Buffer::Target::DrawIndirect,
     Buffer::Target::ShaderStorage,
+    #ifndef MAGNUM_TARGET_GLES
     Buffer::Target::Texture
     #endif
+    #endif
 };
 
 std::size_t BufferState::indexForTarget(Buffer::Target target) {
@@ -67,14 +65,14 @@ std::size_t BufferState::indexForTarget(Buffer::Target target) {
         case Buffer::Target::PixelUnpack:       return 6;
         case Buffer::Target::TransformFeedback: return 7;
         case Buffer::Target::Uniform:           return 8;
-        #endif
-        #ifndef MAGNUM_TARGET_GLES
         case Buffer::Target::AtomicCounter:     return 9;
         case Buffer::Target::DispatchIndirect:  return 10;
         case Buffer::Target::DrawIndirect:      return 11;
         case Buffer::Target::ShaderStorage:     return 12;
+        #ifndef MAGNUM_TARGET_GLES
         case Buffer::Target::Texture:           return 13;
         #endif
+        #endif
     }
 
     CORRADE_ASSERT_UNREACHABLE();
@@ -83,9 +81,9 @@ std::size_t BufferState::indexForTarget(Buffer::Target target) {
 BufferState::BufferState(Context& context, std::vector<std::string>& extensions): bindings()
     #ifndef MAGNUM_TARGET_GLES2
     #ifndef MAGNUM_TARGET_GLES
-    , minMapAlignment(0), maxAtomicCounterBindings(0), maxShaderStorageBindings(0), shaderStorageOffsetAlignment(0)
+    , minMapAlignment(0)
     #endif
-    , maxUniformBindings(0)
+    , maxAtomicCounterBindings(0), maxShaderStorageBindings(0), shaderStorageOffsetAlignment(0), maxUniformBindings(0)
     #endif
 {
     #ifndef MAGNUM_TARGET_GLES

src/Magnum/Implementation/BufferState.h

@@ -32,13 +32,11 @@ namespace Magnum { namespace Implementation {
 struct BufferState {
     #ifndef MAGNUM_TARGET_GLES
     static const std::size_t TargetCount = 13+1;
-    #else
-    #ifndef MAGNUM_TARGET_GLES2
-    static const std::size_t TargetCount = 8+1;
+    #elif !defined(MAGNUM_TARGET_GLES2)
+    static const std::size_t TargetCount = 12+1;
     #else
     static const std::size_t TargetCount = 2+1;
     #endif
-    #endif
 
     /* Target <-> index mapping */
     static std::size_t indexForTarget(Buffer::Target target);
@@ -72,10 +70,10 @@ struct BufferState {
     GLint
         #ifndef MAGNUM_TARGET_GLES
         minMapAlignment,
+        #endif
         maxAtomicCounterBindings,
         maxShaderStorageBindings,
         shaderStorageOffsetAlignment,
-        #endif
         maxUniformBindings;
     #endif
 };

src/Magnum/Implementation/ShaderProgramState.cpp

@@ -34,11 +34,11 @@
 namespace Magnum { namespace Implementation {
 
 ShaderProgramState::ShaderProgramState(Context& context, std::vector<std::string>& extensions): current(0), maxVertexAttributes(0)
-        #ifndef MAGNUM_TARGET_GLES
-        , maxAtomicCounterBufferSize(0), maxComputeSharedMemorySize(0), maxComputeWorkGroupInvocations(0), maxImageUnits(0), maxImageSamples(0), maxCombinedShaderOutputResources(0), maxUniformLocations(0), maxShaderStorageBlockSize(0)
-        #endif
         #ifndef MAGNUM_TARGET_GLES2
-        , minTexelOffset(0), maxTexelOffset(0), maxUniformBlockSize(0)
+        , maxAtomicCounterBufferSize(0), maxComputeSharedMemorySize(0), maxComputeWorkGroupInvocations(0), maxImageUnits(0), maxCombinedShaderOutputResources(0), maxUniformLocations(0), minTexelOffset(0), maxTexelOffset(0), maxUniformBlockSize(0), maxShaderStorageBlockSize(0)
+        #endif
+        #ifndef MAGNUM_TARGET_GLES
+        , maxImageSamples(0)
         #endif
 {
     #ifndef MAGNUM_TARGET_GLES

src/Magnum/Implementation/ShaderProgramState.h

@@ -92,19 +92,21 @@ struct ShaderProgramState {
     GLuint current;
 
     GLint maxVertexAttributes;
-    #ifndef MAGNUM_TARGET_GLES
+    #ifndef MAGNUM_TARGET_GLES2
     GLint maxAtomicCounterBufferSize,
         maxComputeSharedMemorySize,
         maxComputeWorkGroupInvocations,
         maxImageUnits,
-        maxImageSamples,
         maxCombinedShaderOutputResources,
-        maxUniformLocations;
+        maxUniformLocations,
+        minTexelOffset,
+        maxTexelOffset,
+        maxUniformBlockSize;
     GLint64 maxShaderStorageBlockSize;
     #endif
 
-    #ifndef MAGNUM_TARGET_GLES2
-    GLint minTexelOffset, maxTexelOffset, maxUniformBlockSize;
+    #ifndef MAGNUM_TARGET_GLES
+    GLint maxImageSamples;
     #endif
 };
 

src/Magnum/Implementation/ShaderState.h

@@ -35,7 +35,10 @@ struct ShaderState {
     explicit ShaderState():
         maxVertexOutputComponents{}, maxFragmentInputComponents{},
         #ifndef MAGNUM_TARGET_GLES
-        maxTessellationControlInputComponents{}, maxTessellationControlOutputComponents{}, maxTessellationControlTotalOutputComponents{}, maxTessellationEvaluationInputComponents{}, maxTessellationEvaluationOutputComponents{}, maxGeometryInputComponents{}, maxGeometryOutputComponents{}, maxGeometryTotalOutputComponents{}, maxAtomicCounterBuffers{}, maxCombinedAtomicCounterBuffers{}, maxAtomicCounters{}, maxCombinedAtomicCounters{}, maxImageUniforms{}, maxCombinedImageUniforms{}, maxShaderStorageBlocks{}, maxCombinedShaderStorageBlocks{},
+        maxTessellationControlInputComponents{}, maxTessellationControlOutputComponents{}, maxTessellationControlTotalOutputComponents{}, maxTessellationEvaluationInputComponents{}, maxTessellationEvaluationOutputComponents{}, maxGeometryInputComponents{}, maxGeometryOutputComponents{}, maxGeometryTotalOutputComponents{},
+        #endif
+        #ifndef MAGNUM_TARGET_GLES2
+        maxAtomicCounterBuffers{}, maxCombinedAtomicCounterBuffers{}, maxAtomicCounters{}, maxCombinedAtomicCounters{}, maxImageUniforms{}, maxCombinedImageUniforms{}, maxShaderStorageBlocks{}, maxCombinedShaderStorageBlocks{},
         #endif
         maxTextureImageUnits{}, maxTextureImageUnitsCombined{},
         #ifndef MAGNUM_TARGET_GLES2
@@ -66,6 +69,8 @@ struct ShaderState {
         maxGeometryInputComponents,
         maxGeometryOutputComponents,
         maxGeometryTotalOutputComponents;
+    #endif
+    #ifndef MAGNUM_TARGET_GLES2
     GLint maxAtomicCounterBuffers[StageCount];
     GLint maxCombinedAtomicCounterBuffers;
     GLint maxAtomicCounters[StageCount];

src/Magnum/Implementation/TextureState.cpp

@@ -50,8 +50,11 @@ TextureState::TextureState(Context& context, std::vector<std::string>& extension
     maxLodBias{0.0f},
     #endif
     maxMaxAnisotropy(0.0f), currentTextureUnit(0)
+    #ifndef MAGNUM_TARGET_GLES2
+    , maxColorSamples(0), maxDepthSamples(0), maxIntegerSamples(0)
+    #endif
     #ifndef MAGNUM_TARGET_GLES
-    , maxColorSamples(0), maxDepthSamples(0), maxIntegerSamples(0), bufferOffsetAlignment(0)
+    , bufferOffsetAlignment(0)
     #endif
 {
     /* Bind implementation */
@@ -113,6 +116,8 @@ TextureState::TextureState(Context& context, std::vector<std::string>& extension
         #ifndef MAGNUM_TARGET_GLES
         parameterIuivImplementation = &AbstractTexture::parameterIImplementationDefault;
         parameterIivImplementation = &AbstractTexture::parameterIImplementationDefault;
+        #endif
+        #ifndef MAGNUM_TARGET_GLES2
         getLevelParameterivImplementation = &AbstractTexture::getLevelParameterImplementationDefault;
         #endif
         mipmapImplementation = &AbstractTexture::mipmapImplementationDefault;
@@ -213,6 +218,8 @@ TextureState::TextureState(Context& context, std::vector<std::string>& extension
         storage2DMultisampleImplementation = &AbstractTexture::storageMultisampleImplementationFallback;
         storage3DMultisampleImplementation = &AbstractTexture::storageMultisampleImplementationFallback;
     }
+    #elif !defined(MAGNUM_TARGET_GLES2)
+    storage2DMultisampleImplementation = &AbstractTexture::storageMultisampleImplementationDefault;
     #endif
 
     /* Anisotropic filter implementation */

src/Magnum/Implementation/TextureState.h

@@ -71,7 +71,7 @@ struct TextureState {
     void(AbstractTexture::*parameterIivImplementation)(GLenum, const GLint*);
     #endif
     void(AbstractTexture::*setMaxAnisotropyImplementation)(GLfloat);
-    #ifndef MAGNUM_TARGET_GLES
+    #ifndef MAGNUM_TARGET_GLES2
     void(AbstractTexture::*getLevelParameterivImplementation)(GLenum, GLint, GLenum, GLint*);
     #endif
     void(AbstractTexture::*mipmapImplementation)();
@@ -80,8 +80,10 @@ struct TextureState {
     #endif
     void(AbstractTexture::*storage2DImplementation)(GLenum, GLsizei, TextureFormat, const Vector2i&);
     void(AbstractTexture::*storage3DImplementation)(GLenum, GLsizei, TextureFormat, const Vector3i&);
-    #ifndef MAGNUM_TARGET_GLES
+    #ifndef MAGNUM_TARGET_GLES2
     void(AbstractTexture::*storage2DMultisampleImplementation)(GLenum, GLsizei, TextureFormat, const Vector2i&, GLboolean);
+    #endif
+    #ifndef MAGNUM_TARGET_GLES
     void(AbstractTexture::*storage3DMultisampleImplementation)(GLenum, GLsizei, TextureFormat, const Vector3i&, GLboolean);
     void(AbstractTexture::*getImageImplementation)(GLenum, GLint, ColorFormat, ColorType, std::size_t, GLvoid*);
     void(AbstractTexture::*image1DImplementation)(GLenum, GLint, TextureFormat, const Math::Vector<1, GLsizei>&, ColorFormat, ColorType, const GLvoid*);
@@ -117,11 +119,13 @@ struct TextureState {
     #endif
     GLfloat maxMaxAnisotropy;
     GLint currentTextureUnit;
-    #ifndef MAGNUM_TARGET_GLES
+    #ifndef MAGNUM_TARGET_GLES2
     GLint maxColorSamples,
         maxDepthSamples,
-        maxIntegerSamples,
-        bufferOffsetAlignment;
+        maxIntegerSamples;
+    #endif
+    #ifndef MAGNUM_TARGET_GLES
+    GLint bufferOffsetAlignment;
     #endif
 
     std::vector<std::pair<GLenum, GLuint>> bindings;

src/Magnum/Implementation/setupDriverWorkarounds.cpp

@@ -48,13 +48,8 @@ void Context::setupDriverWorkarounds() {
     _setRequiredVersion(GL::ARB::shading_language_420pack, GL320);
     #endif
 
-    #ifdef MAGNUM_TARGET_GLES
-    /* Disable extensions for which we need extension loader, as they would
-       crash otherwise. */
-    /** @todo Remove this when extension loader for ES is available */
-    #ifndef CORRADE_TARGET_NACL
-    _setRequiredVersion(GL::CHROMIUM::map_sub, None);
-    #endif
+    /* Disable extensions not available on NaCl and Emscripten */
+    #if defined(CORRADE_TARGET_NACL) || defined(CORRADE_TARGET_EMSCRIPTEN)
     _setRequiredVersion(GL::EXT::multi_draw_arrays, None);
     _setRequiredVersion(GL::EXT::debug_label, None);
     _setRequiredVersion(GL::EXT::debug_marker, None);
@@ -65,16 +60,12 @@ void Context::setupDriverWorkarounds() {
     _setRequiredVersion(GL::KHR::debug, None);
     _setRequiredVersion(GL::NV::read_buffer_front, None);
     _setRequiredVersion(GL::OES::mapbuffer, None);
-    #ifdef MAGNUM_TARGET_GLES2
     _setRequiredVersion(GL::ANGLE::framebuffer_blit, None);
     _setRequiredVersion(GL::ANGLE::framebuffer_multisample, None);
     _setRequiredVersion(GL::ANGLE::instanced_arrays, None);
     _setRequiredVersion(GL::APPLE::framebuffer_multisample, None);
     _setRequiredVersion(GL::EXT::discard_framebuffer, None);
     _setRequiredVersion(GL::EXT::blend_minmax, None);
-    #ifndef CORRADE_TARGET_NACL
-    _setRequiredVersion(GL::EXT::occlusion_query_boolean, None);
-    #endif
     _setRequiredVersion(GL::EXT::texture_storage, None);
     _setRequiredVersion(GL::EXT::map_buffer_range, None);
     _setRequiredVersion(GL::EXT::instanced_arrays, None);
@@ -89,6 +80,11 @@ void Context::setupDriverWorkarounds() {
     _setRequiredVersion(GL::OES::texture_3D, None);
     _setRequiredVersion(GL::OES::vertex_array_object, None);
     #endif
+
+    /* Disable extensions not available on Emscripten */
+    #ifdef CORRADE_TARGET_EMSCRIPTEN
+    _setRequiredVersion(GL::CHROMIUM::map_sub, None);
+    _setRequiredVersion(GL::EXT::occlusion_query_boolean, None);
     #endif
 
     #undef _setRequiredVersion

src/Magnum/Magnum.h

@@ -603,12 +603,14 @@ enum class MeshPrimitive: GLenum;
 class Mesh;
 class MeshView;
 
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 /* MultisampleTextureSampleLocations enum used only in the function */
 template<UnsignedInt> class MultisampleTexture;
 typedef MultisampleTexture<2> MultisampleTexture2D;
+#ifndef MAGNUM_TARGET_GLES
 typedef MultisampleTexture<3> MultisampleTexture2DArray;
 #endif
+#endif
 
 /* AbstractQuery is not used directly */
 class PrimitiveQuery;

src/Magnum/Mesh.cpp

@@ -285,14 +285,14 @@ void Mesh::drawInternal(Int count, Int baseVertex, Int instanceCount, GLintptr i
 }
 
 void Mesh::bindVAO(GLuint vao) {
-    /** @todo Re-enable when extension loader is available for ES */
     GLuint& current = Context::current()->state().mesh->currentVAO;
     if(current != vao) {
         #ifndef MAGNUM_TARGET_GLES2
         glBindVertexArray(current = vao);
+        #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+        glBindVertexArrayOES(current = vao);
         #else
-        CORRADE_INTERNAL_ASSERT(false);
-        //glBindVertexArrayOES(current = vao);
+        CORRADE_ASSERT_UNREACHABLE();
         #endif
     }
 }
@@ -300,12 +300,12 @@ void Mesh::bindVAO(GLuint vao) {
 void Mesh::createImplementationDefault() { _id = 0; }
 
 void Mesh::createImplementationVAO() {
-    /** @todo Get some extension wrangler instead to avoid linker errors to glGenVertexArrays() on ES2 */
     #ifndef MAGNUM_TARGET_GLES2
     glGenVertexArrays(1, &_id);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glGenVertexArraysOES(1, &_id);
     #else
-    //glGenVertexArraysOES(1, &_id);
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
     CORRADE_INTERNAL_ASSERT(_id != Implementation::State::DisengagedBinding);
 }
@@ -313,12 +313,12 @@ void Mesh::createImplementationVAO() {
 void Mesh::destroyImplementationDefault() {}
 
 void Mesh::destroyImplementationVAO() {
-    /** @todo Get some extension wrangler instead to avoid linker errors to glDeleteVertexArrays() on ES2 */
     #ifndef MAGNUM_TARGET_GLES2
     glDeleteVertexArrays(1, &_id);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glDeleteVertexArraysOES(1, &_id);
     #else
-    //glDeleteVertexArraysOES(1, &_id);
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -426,24 +426,33 @@ void Mesh::vertexAttribPointer(const LongAttribute& attribute) {
 
 #ifdef MAGNUM_TARGET_GLES2
 void Mesh::vertexAttribDivisorImplementationANGLE(const GLuint index, const GLuint divisor) {
-    //glVertexAttribDivisorANGLE(index, divisor);
-    CORRADE_INTERNAL_ASSERT(false);
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glVertexAttribDivisorANGLE(index, divisor);
+    #else
     static_cast<void>(index);
     static_cast<void>(divisor);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 
 void Mesh::vertexAttribDivisorImplementationEXT(const GLuint index, const GLuint divisor) {
-    //glVertexAttribDivisorEXT(index, divisor);
-    CORRADE_INTERNAL_ASSERT(false);
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glVertexAttribDivisorEXT(index, divisor);
+    #else
     static_cast<void>(index);
     static_cast<void>(divisor);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 
 void Mesh::vertexAttribDivisorImplementationNV(const GLuint index, const GLuint divisor) {
-    //glVertexAttribDivisorNV(index, divisor);
-    CORRADE_INTERNAL_ASSERT(false);
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glVertexAttribDivisorNV(index, divisor);
+    #else
     static_cast<void>(index);
     static_cast<void>(divisor);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 #endif
 
@@ -501,51 +510,69 @@ void Mesh::unbindImplementationVAO() {}
 
 #ifdef MAGNUM_TARGET_GLES2
 void Mesh::drawArraysInstancedImplementationANGLE(const GLint baseVertex, const GLsizei count, const GLsizei instanceCount) {
-    //glDrawArraysInstancedANGLE(GLenum(_primitive), baseVertex, count, instanceCount);
-    CORRADE_INTERNAL_ASSERT(false);
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glDrawArraysInstancedANGLE(GLenum(_primitive), baseVertex, count, instanceCount);
+    #else
     static_cast<void>(baseVertex);
     static_cast<void>(count);
     static_cast<void>(instanceCount);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 
 void Mesh::drawArraysInstancedImplementationEXT(const GLint baseVertex, const GLsizei count, const GLsizei instanceCount) {
-    //glDrawArraysInstancedEXT(GLenum(_primitive), baseVertex, count, instanceCount);
-    CORRADE_INTERNAL_ASSERT(false);
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glDrawArraysInstancedEXT(GLenum(_primitive), baseVertex, count, instanceCount);
+    #else
     static_cast<void>(baseVertex);
     static_cast<void>(count);
     static_cast<void>(instanceCount);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 
 void Mesh::drawArraysInstancedImplementationNV(const GLint baseVertex, const GLsizei count, const GLsizei instanceCount) {
-    //glDrawArraysInstancedNV(GLenum(_primitive), baseVertex, count, instanceCount);
-    CORRADE_INTERNAL_ASSERT(false);
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glDrawArraysInstancedNV(GLenum(_primitive), baseVertex, count, instanceCount);
+    #else
     static_cast<void>(baseVertex);
     static_cast<void>(count);
     static_cast<void>(instanceCount);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 
 void Mesh::drawElementsInstancedImplementationANGLE(const GLsizei count, const GLintptr indexOffset, const GLsizei instanceCount) {
-    //glDrawElementsInstancedANGLE(GLenum(_primitive), count, GLenum(_indexType), reinterpret_cast<GLvoid*>(indexOffset), instanceCount);
-    CORRADE_INTERNAL_ASSERT(false);
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glDrawElementsInstancedANGLE(GLenum(_primitive), count, GLenum(_indexType), reinterpret_cast<GLvoid*>(indexOffset), instanceCount);
+    #else
     static_cast<void>(count);
     static_cast<void>(indexOffset);
     static_cast<void>(instanceCount);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 
 void Mesh::drawElementsInstancedImplementationEXT(const GLsizei count, const GLintptr indexOffset, const GLsizei instanceCount) {
-    //glDrawElementsInstancedEXT(GLenum(_primitive), count, GLenum(_indexType), reinterpret_cast<GLvoid*>(indexOffset), instanceCount);
-    CORRADE_INTERNAL_ASSERT(false);
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glDrawElementsInstancedEXT(GLenum(_primitive), count, GLenum(_indexType), reinterpret_cast<GLvoid*>(indexOffset), instanceCount);
+    #else
     static_cast<void>(count);
     static_cast<void>(indexOffset);
     static_cast<void>(instanceCount);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 
 void Mesh::drawElementsInstancedImplementationNV(const GLsizei count, const GLintptr indexOffset, const GLsizei instanceCount) {
-    //glDrawElementsInstancedNV(GLenum(_primitive), count, GLenum(_indexType), reinterpret_cast<GLvoid*>(indexOffset), instanceCount);
-    CORRADE_INTERNAL_ASSERT(false);
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glDrawElementsInstancedNV(GLenum(_primitive), count, GLenum(_indexType), reinterpret_cast<GLvoid*>(indexOffset), instanceCount);
+    #else
     static_cast<void>(count);
     static_cast<void>(indexOffset);
     static_cast<void>(instanceCount);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 #endif
 

src/Magnum/MeshView.cpp

@@ -95,9 +95,10 @@ void MeshView::multiDrawImplementationDefault(std::initializer_list<std::referen
     if(!original._indexBuffer) {
         #ifndef MAGNUM_TARGET_GLES
         glMultiDrawArrays(GLenum(original._primitive), baseVertex, count, meshes.size());
+        #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+        glMultiDrawArraysEXT(GLenum(original._primitive), baseVertex, count, meshes.size());
         #else
-        //glMultiDrawArraysEXT(GLenum(original._primitive), baseVertex, count, meshes.size());
-        CORRADE_INTERNAL_ASSERT(false);
+        CORRADE_ASSERT_UNREACHABLE();
         #endif
 
     /* Indexed meshes */
@@ -113,9 +114,10 @@ void MeshView::multiDrawImplementationDefault(std::initializer_list<std::referen
         {
             #ifndef MAGNUM_TARGET_GLES
             glMultiDrawElements(GLenum(original._primitive), count, GLenum(original._indexType), indices, meshes.size());
+            #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+            glMultiDrawElementsEXT(GLenum(original._primitive), count, GLenum(original._indexType), indices, meshes.size());
             #else
-            //glMultiDrawElements(GLenum(original._primitive), count, GLenum(original._indexType), indices, meshes.size());
-            CORRADE_INTERNAL_ASSERT(false);
+            CORRADE_ASSERT_UNREACHABLE();
             #endif
         }
     }

src/Magnum/MultisampleTexture.cpp

@@ -25,7 +25,7 @@
 
 #include "MultisampleTexture.h"
 
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/Context.h"
 #include "Magnum/Extensions.h"
 
@@ -34,18 +34,24 @@
 namespace Magnum { namespace Implementation {
 
 template<> Vector2i MAGNUM_EXPORT maxMultisampleTextureSize<2>() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
-        return {};
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
+        return Vector2i{0};
 
     return Vector2i{Implementation::maxTextureSideSize()};
 }
 
+#ifndef MAGNUM_TARGET_GLES
 template<> Vector3i MAGNUM_EXPORT maxMultisampleTextureSize<3>() {
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
-        return {};
+        return Vector3i{0};
 
     return {Vector2i{Implementation::maxTextureSideSize()}, Implementation::max3DTextureDepth()};
 }
+#endif
 
 }}
 #endif

src/Magnum/MultisampleTexture.h

@@ -25,7 +25,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 /** @file
  * @brief Class @ref Magnum::MultisampleTexture, typedef @ref Magnum::MultisampleTexture2D, @ref Magnum::MultisampleTexture2DArray
  */
@@ -35,17 +35,21 @@
 #include "Magnum/DimensionTraits.h"
 #include "Magnum/Math/Vector3.h"
 
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 namespace Magnum {
 
 namespace Implementation {
     template<UnsignedInt> constexpr GLenum multisampleTextureTarget();
     template<> inline constexpr GLenum multisampleTextureTarget<2>() { return GL_TEXTURE_2D_MULTISAMPLE; }
+    #ifndef MAGNUM_TARGET_GLES
     template<> inline constexpr GLenum multisampleTextureTarget<3>() { return GL_TEXTURE_2D_MULTISAMPLE_ARRAY; }
+    #endif
 
     template<UnsignedInt dimensions> typename DimensionTraits<dimensions, Int>::VectorType maxMultisampleTextureSize();
     template<> MAGNUM_EXPORT Vector2i maxMultisampleTextureSize<2>();
+    #ifndef MAGNUM_TARGET_GLES
     template<> MAGNUM_EXPORT Vector3i maxMultisampleTextureSize<3>();
+    #endif
 }
 
 /**
@@ -83,7 +87,10 @@ shaders.
     @ref TextureArray, @ref CubeMapTexture, @ref CubeMapTextureArray,
     @ref RectangleTexture, @ref BufferTexture
 @requires_gl32 %Extension @extension{ARB,texture_multisample}
-@requires_gl Multisample textures are not available in OpenGL ES.
+@requires_gles31 Multisample textures are not available in OpenGL ES 3.0 and
+    older.
+@requires_gl 2D array multisample textures are not available in OpenGL ES, only
+    2D ones.
  */
 template<UnsignedInt dimensions> class MultisampleTexture: public AbstractTexture {
     public:
@@ -93,8 +100,9 @@ template<UnsignedInt dimensions> class MultisampleTexture: public AbstractTextur
          * @brief Max supported multisample texture size
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,texture_multisample} (part
-         * of OpenGL 3.2) is not available, returns zero vector.
+         * OpenGL calls. If neither extension @extension{ARB,texture_multisample}
+         * (part of OpenGL 3.2) nor OpenGL ES 3.1 is available, returns zero
+         * vector.
          * @see @fn_gl{Get} with @def_gl{MAX_TEXTURE_SIZE} and
          *      @def_gl{MAX_3D_TEXTURE_SIZE}
          */
@@ -187,11 +195,25 @@ template<UnsignedInt dimensions> class MultisampleTexture: public AbstractTextur
         #endif
 };
 
-/** @brief Two-dimensional multisample texture */
+/**
+@brief Two-dimensional multisample texture
+
+@requires_gl32 %Extension @extension{ARB,texture_multisample}
+@requires_gles31 Multisample textures are not available in OpenGL ES 3.0 and
+    older.
+*/
 typedef MultisampleTexture<2> MultisampleTexture2D;
 
-/** @brief Two-dimensional multisample texture array */
+#ifndef MAGNUM_TARGET_GLES
+/**
+@brief Two-dimensional multisample texture array
+
+@requires_gl32 %Extension @extension{ARB,texture_multisample}
+@requires_gl Only @ref Magnum::MultisampleTexture2D "MultisampleTexture2D" is
+    available in OpenGL ES.
+*/
 typedef MultisampleTexture<3> MultisampleTexture2DArray;
+#endif
 
 }
 #else

src/Magnum/OpenGL.h

@@ -33,41 +33,29 @@
 
 #include "Magnum/configure.h"
 
-/** @todo Remove NaCl workaround when not needed */
-
 /* Desktop OpenGL */
 #ifndef MAGNUM_TARGET_GLES
     #include "MagnumExternal/OpenGL/GL/flextGL.h"
 
-/* NaCl has its own gl2.h, the official one causes linker issues. Additionaly
-   to NaCl's gl2ext.h we are including our own to prevent undeclared symbol
-   errors with some recent extensions. */
+/* Special case for NaCl */
 #elif defined(CORRADE_TARGET_NACL)
-    /* Enable function prototypes (the supported ones shouldn't fail at link time) */
-    #define GL_GLEXT_PROTOTYPES
+    /* No extension loading */
+    #include "MagnumExternal/OpenGL/GLES2/flextGLNaCl.h"
 
-    #include <GLES2/gl2.h>
+    /* Needed for NaCl-specific extensions */
+    #define GL_GLEXT_PROTOTYPES
+    #define GLES2_GET_FUN(name) GLES2##name
     #include <GLES2/gl2ext.h>
 
-    /* We need to define missing types for new extensions */
-    #include <cstdint>
-    typedef struct __GLsync *GLsync;
-    typedef std::uint64_t GLuint64;
-    typedef std::int64_t GLint64;
-    #undef __gl2ext_h_
-    #include "MagnumExternal/OpenGL/GLES2/gl2ext.h"
+/* Special case for Emscripten (no extension loading) */
+#elif defined(CORRADE_TARGET_EMSCRIPTEN)
+    #include "MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h"
 
 /* Generic OpenGL ES */
+#elif defined(MAGNUM_TARGET_GLES2)
+    #include "MagnumExternal/OpenGL/GLES2/flextGL.h"
 #else
-    #include "MagnumExternal/OpenGL/KHR/khrplatform.h"
-    #ifndef MAGNUM_TARGET_GLES2
-        #include "MagnumExternal/OpenGL/GLES3/gl3platform.h"
-        #include "MagnumExternal/OpenGL/GLES3/gl3.h"
-    #else
-        #include "MagnumExternal/OpenGL/GLES2/gl2platform.h"
-        #include "MagnumExternal/OpenGL/GLES2/gl2.h"
-    #endif
-    #include "MagnumExternal/OpenGL/GLES2/gl2ext.h"
+    #include "MagnumExternal/OpenGL/GLES3/flextGL.h"
 #endif
 
 #endif

src/Magnum/Platform/CMakeLists.txt

@@ -37,16 +37,19 @@ set(MagnumPlatform_FILES )
 install(FILES ${MagnumPlatform_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform)
 
 # Decide about platform-specific context for cross-platform toolkits
-if((WITH_GLUTAPPLICATION OR WITH_SDL2APPLICATION) AND NOT MAGNUM_TARGET_GLES)
-    if(CORRADE_TARGET_APPLE)
+if(WITH_GLUTAPPLICATION OR WITH_SDL2APPLICATION)
+    if(CORRADE_TARGET_APPLE AND NOT MAGNUM_TARGET_GLES)
         set(NEED_CGLCONTEXT 1)
         set(MagnumSomeContext_OBJECTS $<TARGET_OBJECTS:MagnumCglContextObjects>)
-    elseif(CORRADE_TARGET_WINDOWS)
+    elseif(CORRADE_TARGET_WINDOWS AND NOT MAGNUM_TARGET_GLES)
         set(NEED_WGLCONTEXT 1)
         set(MagnumSomeContext_OBJECTS $<TARGET_OBJECTS:MagnumWglContextObjects>)
-    elseif(CORRADE_TARGET_UNIX)
+    elseif(CORRADE_TARGET_UNIX AND (NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES))
         set(NEED_GLXCONTEXT 1)
         set(MagnumSomeContext_OBJECTS $<TARGET_OBJECTS:MagnumGlxContextObjects>)
+    elseif(MAGNUM_TARGET_GLES AND NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_NACL)
+        set(NEED_EGLCONTEXT 1)
+        set(MagnumSomeContext_OBJECTS $<TARGET_OBJECTS:MagnumEglContextObjects>)
     endif()
 endif()
 
@@ -56,11 +59,14 @@ if(WITH_ANDROIDAPPLICATION)
         message(FATAL_ERROR "AndroidApplication is available only when targeting Android. Set WITH_ANDROIDAPPLICATION to OFF to skip building it.")
     endif()
 
+    set(NEED_EGLCONTEXT 1)
+
     include_directories(${ANDROID_NATIVE_APP_GLUE_INCLUDE_DIR})
 
     set(MagnumAndroidApplication_SRCS
         AndroidApplication.cpp
-        Implementation/Egl.cpp)
+        Implementation/Egl.cpp
+        $<TARGET_OBJECTS:MagnumEglContextObjects>)
     set(MagnumAndroidApplication_HEADERS
         AndroidApplication.h)
     set(MagnumAndroidApplication_PRIVATE_HEADERS
@@ -190,17 +196,13 @@ endif()
 if(WITH_GLXAPPLICATION)
     set(NEED_ABSTRACTXAPPLICATION 1)
     set(NEED_GLXCONTEXTHANDLER 1)
-    if(NOT MAGNUM_TARGET_GLES)
-        set(NEED_GLXCONTEXT 1)
-    endif()
+    set(NEED_GLXCONTEXT 1)
 
     set(MagnumGlxApplication_SRCS
         GlxApplication.cpp
         $<TARGET_OBJECTS:MagnumAbstractXApplication>
-        $<TARGET_OBJECTS:MagnumGlxContextHandler>)
-    if(NOT MAGNUM_TARGET_GLES)
-        list(APPEND MagnumWindowlessGlxApplication_SRCS $<TARGET_OBJECTS:MagnumGlxContextObjects>)
-    endif()
+        $<TARGET_OBJECTS:MagnumGlxContextHandler>
+        $<TARGET_OBJECTS:MagnumGlxContextObjects>)
     set(MagnumGlxApplication_HEADERS GlxApplication.h)
 
     add_library(MagnumGlxApplication STATIC
@@ -218,11 +220,13 @@ endif()
 if(WITH_XEGLAPPLICATION)
     set(NEED_ABSTRACTXAPPLICATION 1)
     set(NEED_EGLCONTEXTHANDLER 1)
+    set(NEED_EGLCONTEXT 1)
 
     set(MagnumXEglApplication_SRCS
         XEglApplication.cpp
         $<TARGET_OBJECTS:MagnumAbstractXApplication>
-        $<TARGET_OBJECTS:MagnumEglContextHandler>)
+        $<TARGET_OBJECTS:MagnumEglContextHandler>
+        $<TARGET_OBJECTS:MagnumEglContextObjects>)
     set(MagnumXEglApplication_HEADERS XEglApplication.h)
 
     add_library(MagnumXEglApplication STATIC
@@ -245,14 +249,11 @@ endif()
 
 # Windowless GLX application
 if(WITH_WINDOWLESSGLXAPPLICATION)
-    if(NOT MAGNUM_TARGET_GLES)
-        set(NEED_GLXCONTEXT 1)
-    endif()
+    set(NEED_GLXCONTEXT 1)
 
-    set(MagnumWindowlessGlxApplication_SRCS WindowlessGlxApplication.cpp)
-    if(NOT MAGNUM_TARGET_GLES)
-        list(APPEND MagnumWindowlessGlxApplication_SRCS $<TARGET_OBJECTS:MagnumGlxContextObjects>)
-    endif()
+    set(MagnumWindowlessGlxApplication_SRCS
+        WindowlessGlxApplication.cpp
+        $<TARGET_OBJECTS:MagnumGlxContextObjects>)
     set(MagnumWindowlessGlxApplication_HEADERS WindowlessGlxApplication.h)
 
     add_library(MagnumWindowlessGlxApplication STATIC
@@ -365,10 +366,13 @@ if(NEED_EGLCONTEXTHANDLER)
 endif()
 
 # Platform-specific sources for context library
+set(MagnumContext_SRCS Implementation/OpenGLFunctionLoader.cpp)
 if(NOT MAGNUM_TARGET_GLES)
-    set(MagnumContext_SRCS
-        Implementation/OpenGLFunctionLoader.cpp
-        ../../MagnumExternal/OpenGL/GL/flextGLPlatform.cpp)
+    list(APPEND MagnumContext_SRCS ../../MagnumExternal/OpenGL/GL/flextGLPlatform.cpp)
+elseif(MAGNUM_TARGET_GLES AND MAGNUM_TARGET_GLES2)
+    list(APPEND MagnumContext_SRCS ../../MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp)
+elseif(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_GLES2)
+    list(APPEND MagnumContext_SRCS ../../MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp)
 endif()
 
 # CGL context
@@ -389,6 +393,22 @@ if(NEED_CGLCONTEXT OR WITH_CGLCONTEXT)
     endif()
 endif()
 
+# EGL context
+if(NEED_EGLCONTEXT OR WITH_EGLCONTEXT)
+    add_library(MagnumEglContextObjects OBJECT ${MagnumContext_SRCS})
+    set_target_properties(MagnumEglContextObjects PROPERTIES COMPILE_DEFINITIONS "MAGNUM_PLATFORM_USE_EGL")
+
+    # Also create proper static library, if requested
+    if(WITH_EGLCONTEXT)
+        add_library(MagnumEglContext STATIC $<TARGET_OBJECTS:MagnumEglContextObjects>)
+        set_target_properties(MagnumEglContext PROPERTIES DEBUG_POSTFIX "-d")
+        install(TARGETS MagnumEglContext
+            RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
+            LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
+            ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
+    endif()
+endif()
+
 # GLX context
 if(NEED_GLXCONTEXT OR WITH_GLXCONTEXT)
     add_library(MagnumGlxContextObjects OBJECT ${MagnumContext_SRCS})

src/Magnum/Platform/Context.h

@@ -52,7 +52,7 @@ class Context: public Magnum::Context {
          *      @fn_gl{GetString} with @def_gl{EXTENSIONS}
          */
         explicit Context():
-            #ifndef MAGNUM_TARGET_GLES
+            #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
             Magnum::Context{flextGLInit} {}
             #else
             Magnum::Context{nullptr} {}

src/Magnum/Platform/Implementation/OpenGLFunctionLoader.cpp

@@ -42,6 +42,10 @@
 #elif defined(CORRADE_TARGET_UNIX) && defined(MAGNUM_PLATFORM_USE_GLX)
 #include <GL/glx.h>
 
+/* EGL-specific includes */
+#elif defined(MAGNUM_PLATFORM_USE_EGL)
+#include <EGL/egl.h>
+
 /* Otherwise unsupported */
 #else
 #error Unsupported platform
@@ -92,6 +96,16 @@ auto OpenGLFunctionLoader::load(const char* const name) -> FunctionPointer {
     return glXGetProcAddressARB(reinterpret_cast<const GLubyte*>(name));
 }
 
+/* EGL-specific implementation */
+#elif defined(MAGNUM_PLATFORM_USE_EGL)
+OpenGLFunctionLoader::OpenGLFunctionLoader() = default;
+
+OpenGLFunctionLoader::~OpenGLFunctionLoader() = default;
+
+auto OpenGLFunctionLoader::load(const char* const name) -> FunctionPointer {
+    return eglGetProcAddress(name);
+}
+
 /* Otherwise unsupported */
 #else
 #error Unsupported platform

src/Magnum/Platform/Implementation/OpenGLFunctionLoader.h

@@ -63,6 +63,9 @@ class OpenGLFunctionLoader {
         /* GLX-specific handles (nothing needed) */
         #elif defined(CORRADE_TARGET_UNIX) && defined(MAGNUM_PLATFORM_USE_GLX)
 
+        /* EGL-specific handles (nothing needed) */
+        #elif defined(MAGNUM_PLATFORM_USE_EGL)
+
         /* Otherwise unsupported */
         #else
         #error Unsupported platform

src/Magnum/Platform/NaClApplication.h

@@ -32,6 +32,10 @@
 #include <string>
 #include <Corrade/compatibility.h>
 #include <Corrade/Containers/EnumSet.h>
+
+/* Needs to be first */
+#include "Magnum/OpenGL.h"
+
 #include <ppapi/cpp/input_event.h>
 #include <ppapi/cpp/instance.h>
 #include <ppapi/cpp/module.h>

src/Magnum/Platform/WindowlessNaClApplication.h

@@ -32,6 +32,10 @@
 #include <string>
 #include <Corrade/compatibility.h>
 #include <Corrade/Containers/EnumSet.h>
+
+/* Needs to be first */
+#include "Magnum/OpenGL.h"
+
 #include <ppapi/cpp/instance.h>
 #include <ppapi/cpp/module.h>
 #include <ppapi/cpp/graphics_3d_client.h>

src/Magnum/Platform/magnum-info.cpp

@@ -40,8 +40,10 @@
 #include "Magnum/Extensions.h"
 #include "Magnum/Framebuffer.h"
 #include "Magnum/Mesh.h"
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/MultisampleTexture.h"
+#endif
+#ifndef MAGNUM_TARGET_GLES
 #include "Magnum/RectangleTexture.h"
 #endif
 #include "Magnum/Renderbuffer.h"
@@ -315,6 +317,8 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
     _l(Shader::maxTextureImageUnits(Shader::Type::TessellationControl))
     _l(Shader::maxTextureImageUnits(Shader::Type::TessellationEvaluation))
     _l(Shader::maxTextureImageUnits(Shader::Type::Geometry))
+    #endif
+    #ifndef MAGNUM_TARGET_GLES2
     _l(Shader::maxTextureImageUnits(Shader::Type::Compute))
     #endif
     _l(Shader::maxTextureImageUnits(Shader::Type::Fragment))
@@ -324,18 +328,12 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
     _l(Shader::maxUniformComponents(Shader::Type::TessellationControl))
     _l(Shader::maxUniformComponents(Shader::Type::TessellationEvaluation))
     _l(Shader::maxUniformComponents(Shader::Type::Geometry))
+    #endif
+    #ifndef MAGNUM_TARGET_GLES2
     _l(Shader::maxUniformComponents(Shader::Type::Compute))
     #endif
     _l(Shader::maxUniformComponents(Shader::Type::Fragment))
-    #ifndef MAGNUM_TARGET_GLES
-    _l(AbstractShaderProgram::maxUniformLocations())
-    #endif
     _l(AbstractShaderProgram::maxVertexAttributes())
-    #ifndef MAGNUM_TARGET_GLES
-    _l(AbstractTexture::maxColorSamples())
-    _l(AbstractTexture::maxDepthSamples())
-    _l(AbstractTexture::maxIntegerSamples())
-    #endif
     #ifndef MAGNUM_TARGET_GLES2
     _l(AbstractTexture::maxLodBias())
     #endif
@@ -344,7 +342,7 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
     #endif
     _lvec(Texture2D::maxSize())
     #ifndef MAGNUM_TARGET_GLES2
-    _lvec(Texture3D::maxSize())
+    _lvec(Texture3D::maxSize()) /* Checked ES2 version below */
     #endif
 
     #ifndef MAGNUM_TARGET_GLES
@@ -353,14 +351,34 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
 
         _l(AbstractFramebuffer::maxDualSourceDrawBuffers())
     }
+    #endif
 
-    if(c->isExtensionSupported<Extensions::GL::ARB::compute_shader>()) {
+    #ifndef MAGNUM_TARGET_GLES2
+    #ifndef MAGNUM_TARGET_GLES
+    if(c->isExtensionSupported<Extensions::GL::ARB::compute_shader>())
+    #endif
+    {
+        #ifndef MAGNUM_TARGET_GLES
         _h(ARB::compute_shader)
+        #endif
 
         _l(AbstractShaderProgram::maxComputeSharedMemorySize())
         _l(AbstractShaderProgram::maxComputeWorkGroupInvocations())
     }
 
+    #ifndef MAGNUM_TARGET_GLES
+    if(c->isExtensionSupported<Extensions::GL::ARB::explicit_uniform_location>())
+    #endif
+    {
+        #ifndef MAGNUM_TARGET_GLES
+        _h(ARB::explicit_uniform_location)
+        #endif
+
+        _l(AbstractShaderProgram::maxUniformLocations())
+    }
+    #endif
+
+    #ifndef MAGNUM_TARGET_GLES
     if(c->isExtensionSupported<Extensions::GL::ARB::geometry_shader4>()) {
         _h(ARB::geometry_shader4)
 
@@ -368,57 +386,86 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
         _l(Shader::maxGeometryOutputComponents())
         _l(Shader::maxGeometryTotalOutputComponents())
     }
+    #endif
 
-    if(c->isExtensionSupported<Extensions::GL::ARB::shader_atomic_counters>()) {
+    #ifndef MAGNUM_TARGET_GLES2
+    #ifndef MAGNUM_TARGET_GLES
+    if(c->isExtensionSupported<Extensions::GL::ARB::shader_atomic_counters>())
+    #endif
+    {
+        #ifndef MAGNUM_TARGET_GLES
         _h(ARB::shader_atomic_counters)
+        #endif
 
         _l(Buffer::maxAtomicCounterBindings())
         _l(Shader::maxAtomicCounterBuffers(Shader::Type::Vertex))
+        #ifndef MAGNUM_TARGET_GLES
         _l(Shader::maxAtomicCounterBuffers(Shader::Type::TessellationControl))
         _l(Shader::maxAtomicCounterBuffers(Shader::Type::TessellationEvaluation))
         _l(Shader::maxAtomicCounterBuffers(Shader::Type::Geometry))
+        #endif
         _l(Shader::maxAtomicCounterBuffers(Shader::Type::Compute))
         _l(Shader::maxAtomicCounterBuffers(Shader::Type::Fragment))
         _l(Shader::maxCombinedAtomicCounterBuffers())
         _l(Shader::maxAtomicCounters(Shader::Type::Vertex))
+        #ifndef MAGNUM_TARGET_GLES
         _l(Shader::maxAtomicCounters(Shader::Type::TessellationControl))
         _l(Shader::maxAtomicCounters(Shader::Type::TessellationEvaluation))
         _l(Shader::maxAtomicCounters(Shader::Type::Geometry))
+        #endif
         _l(Shader::maxAtomicCounters(Shader::Type::Compute))
         _l(Shader::maxAtomicCounters(Shader::Type::Fragment))
         _l(Shader::maxCombinedAtomicCounters())
         _l(AbstractShaderProgram::maxAtomicCounterBufferSize())
     }
 
-    if(c->isExtensionSupported<Extensions::GL::ARB::shader_image_load_store>()) {
+    #ifndef MAGNUM_TARGET_GLES
+    if(c->isExtensionSupported<Extensions::GL::ARB::shader_image_load_store>())
+    #endif
+    {
+        #ifndef MAGNUM_TARGET_GLES
         _h(ARB::shader_image_load_store)
+        #endif
 
         _l(Shader::maxImageUniforms(Shader::Type::Vertex))
+        #ifndef MAGNUM_TARGET_GLES
         _l(Shader::maxImageUniforms(Shader::Type::TessellationControl))
         _l(Shader::maxImageUniforms(Shader::Type::TessellationEvaluation))
         _l(Shader::maxImageUniforms(Shader::Type::Geometry))
+        #endif
         _l(Shader::maxImageUniforms(Shader::Type::Compute))
         _l(Shader::maxImageUniforms(Shader::Type::Fragment))
         _l(Shader::maxCombinedImageUniforms())
         _l(AbstractShaderProgram::maxCombinedShaderOutputResources())
         _l(AbstractShaderProgram::maxImageUnits())
+        #ifndef MAGNUM_TARGET_GLES
         _l(AbstractShaderProgram::maxImageSamples())
+        #endif
     }
 
-    if(c->isExtensionSupported<Extensions::GL::ARB::shader_storage_buffer_object>()) {
+    #ifndef MAGNUM_TARGET_GLES
+    if(c->isExtensionSupported<Extensions::GL::ARB::shader_storage_buffer_object>())
+    #endif
+    {
+        #ifndef MAGNUM_TARGET_GLES
         _h(ARB::shader_storage_buffer_object)
+        #endif
 
         _l(Shader::maxShaderStorageBlocks(Shader::Type::Vertex))
+        #ifndef MAGNUM_TARGET_GLES
         _l(Shader::maxShaderStorageBlocks(Shader::Type::TessellationControl))
         _l(Shader::maxShaderStorageBlocks(Shader::Type::TessellationEvaluation))
         _l(Shader::maxShaderStorageBlocks(Shader::Type::Geometry))
+        #endif
         _l(Shader::maxShaderStorageBlocks(Shader::Type::Compute))
         _l(Shader::maxShaderStorageBlocks(Shader::Type::Fragment))
         _l(Shader::maxCombinedShaderStorageBlocks())
         /* AbstractShaderProgram::maxCombinedShaderOutputResources() already in shader_image_load_store */
         _l(AbstractShaderProgram::maxShaderStorageBlockSize())
     }
+    #endif
 
+    #ifndef MAGNUM_TARGET_GLES
     if(c->isExtensionSupported<Extensions::GL::ARB::tessellation_shader>()) {
         _h(ARB::tessellation_shader)
 
@@ -442,14 +489,28 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
 
         _l(BufferTexture::offsetAlignment())
     }
+    #endif
 
-    if(c->isExtensionSupported<Extensions::GL::ARB::texture_multisample>()) {
+    #ifndef MAGNUM_TARGET_GLES2
+    #ifndef MAGNUM_TARGET_GLES
+    if(c->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
+    #endif
+    {
+        #ifndef MAGNUM_TARGET_GLES
         _h(ARB::texture_multisample)
+        #endif
 
+        _l(AbstractTexture::maxColorSamples())
+        _l(AbstractTexture::maxDepthSamples())
+        _l(AbstractTexture::maxIntegerSamples())
         _lvec(MultisampleTexture2D::maxSize())
+        #ifndef MAGNUM_TARGET_GLES
         _lvec(MultisampleTexture2DArray::maxSize())
+        #endif
     }
+    #endif
 
+    #ifndef MAGNUM_TARGET_GLES
     if(c->isExtensionSupported<Extensions::GL::ARB::texture_rectangle>()) {
         _h(ARB::texture_rectangle)
 
@@ -457,8 +518,6 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
     }
     #endif
 
-    /** @todo Somehow sort the following into previous list for ES3 */
-
     #ifndef MAGNUM_TARGET_GLES2
     #ifndef MAGNUM_TARGET_GLES
     if(c->isExtensionSupported<Extensions::GL::ARB::uniform_buffer_object>())
@@ -473,8 +532,8 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
         _l(Shader::maxUniformBlocks(Shader::Type::TessellationControl))
         _l(Shader::maxUniformBlocks(Shader::Type::TessellationEvaluation))
         _l(Shader::maxUniformBlocks(Shader::Type::Geometry))
-        _l(Shader::maxUniformBlocks(Shader::Type::Compute))
         #endif
+        _l(Shader::maxUniformBlocks(Shader::Type::Compute))
         _l(Shader::maxUniformBlocks(Shader::Type::Fragment))
         _l(Shader::maxCombinedUniformBlocks())
         _l(Shader::maxCombinedUniformComponents(Shader::Type::Vertex))
@@ -482,8 +541,8 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
         _l(Shader::maxCombinedUniformComponents(Shader::Type::TessellationControl))
         _l(Shader::maxCombinedUniformComponents(Shader::Type::TessellationEvaluation))
         _l(Shader::maxCombinedUniformComponents(Shader::Type::Geometry))
-        _l(Shader::maxCombinedUniformComponents(Shader::Type::Compute))
         #endif
+        _l(Shader::maxCombinedUniformComponents(Shader::Type::Compute))
         _l(Shader::maxCombinedUniformComponents(Shader::Type::Fragment))
         _l(AbstractShaderProgram::maxUniformBlockSize())
     }

src/Magnum/Query.cpp

@@ -34,13 +34,12 @@
 namespace Magnum {
 
 AbstractQuery::AbstractQuery(): target() {
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES2
     glGenQueries(1, &_id);
-    #elif defined(CORRADE_TARGET_NACL)
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN)
     glGenQueriesEXT(1, &_id);
     #else
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -48,13 +47,12 @@ AbstractQuery::~AbstractQuery() {
     /* Moved out, nothing to do */
     if(!_id) return;
 
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES2
     glDeleteQueries(1, &_id);
-    #elif defined(CORRADE_TARGET_NACL)
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN)
     glDeleteQueriesEXT(1, &_id);
     #else
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
@@ -78,14 +76,13 @@ AbstractQuery& AbstractQuery::setLabelInternal(const Containers::ArrayReference<
 bool AbstractQuery::resultAvailable() {
     CORRADE_ASSERT(!target, "AbstractQuery::resultAvailable(): the query is currently running", false);
 
-    /** @todo Re-enable when extension loader is available for ES */
     GLuint result;
     #ifndef MAGNUM_TARGET_GLES2
     glGetQueryObjectuiv(_id, GL_QUERY_RESULT_AVAILABLE, &result);
-    #elif defined(CORRADE_TARGET_NACL)
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN)
     glGetQueryObjectuivEXT(_id, GL_QUERY_RESULT_AVAILABLE_EXT, &result);
     #else
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
     return result == GL_TRUE;
 }
@@ -94,14 +91,13 @@ bool AbstractQuery::resultAvailable() {
 template<> UnsignedInt AbstractQuery::result<UnsignedInt>() {
     CORRADE_ASSERT(!target, "AbstractQuery::result(): the query is currently running", {});
 
-    /** @todo Re-enable when extension loader is available for ES */
     UnsignedInt result;
     #ifndef MAGNUM_TARGET_GLES2
     glGetQueryObjectuiv(_id, GL_QUERY_RESULT, &result);
-    #elif defined(CORRADE_TARGET_NACL)
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN)
     glGetQueryObjectuivEXT(_id, GL_QUERY_RESULT_EXT, &result);
     #else
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
     return result;
 }
@@ -111,14 +107,13 @@ template<> bool AbstractQuery::result<bool>() { return result<UnsignedInt>() !=
 template<> Int AbstractQuery::result<Int>() {
     CORRADE_ASSERT(!target, "AbstractQuery::result(): the query is currently running", {});
 
-    /** @todo Re-enable when extension loader is available for ES */
     Int result;
     #ifndef MAGNUM_TARGET_GLES
     glGetQueryObjectiv(_id, GL_QUERY_RESULT, &result);
-    #elif defined(CORRADE_TARGET_NACL)
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN)
     glGetQueryObjectivEXT(_id, GL_QUERY_RESULT_EXT, &result);
     #else
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
     return result;
 }
@@ -127,13 +122,13 @@ template<> Int AbstractQuery::result<Int>() {
 template<> UnsignedLong AbstractQuery::result<UnsignedLong>() {
     CORRADE_ASSERT(!target, "AbstractQuery::result(): the query is currently running", {});
 
-    /** @todo Re-enable when extension loader is available for ES */
     UnsignedLong result;
     #ifndef MAGNUM_TARGET_GLES
     glGetQueryObjectui64v(_id, GL_QUERY_RESULT, &result);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glGetQueryObjectui64vEXT(_id, GL_QUERY_RESULT_EXT, &result);
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glGetQueryObjectui64vEXT(_id, GL_QUERY_RESULT, &result);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
     return result;
 }
@@ -141,13 +136,13 @@ template<> UnsignedLong AbstractQuery::result<UnsignedLong>() {
 template<> Long AbstractQuery::result<Long>() {
     CORRADE_ASSERT(!target, "AbstractQuery::result(): the query is currently running", {});
 
-    /** @todo Re-enable when extension loader is available for ES */
     Long result;
     #ifndef MAGNUM_TARGET_GLES
     glGetQueryObjecti64v(_id, GL_QUERY_RESULT, &result);
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    glGetQueryObjecti64vEXT(_id, GL_QUERY_RESULT_EXT, &result);
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //glGetQueryObjecti64vEXT(_id, GL_QUERY_RESULT, &result);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
     return result;
 }
@@ -157,27 +152,25 @@ template<> Long AbstractQuery::result<Long>() {
 void AbstractQuery::begin(GLenum target) {
     CORRADE_ASSERT(!this->target, "AbstractQuery::begin(): the query is already running", );
 
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES2
     glBeginQuery(this->target = target, id());
-    #elif defined(CORRADE_TARGET_NACL)
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN)
     glBeginQueryEXT(this->target = target, id());
     #else
     static_cast<void>(target);
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 
 void AbstractQuery::end() {
     CORRADE_ASSERT(target, "AbstractQuery::end(): the query is not running", );
 
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES2
     glEndQuery(target);
-    #elif defined(CORRADE_TARGET_NACL)
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN)
     glEndQueryEXT(target);
     #else
-    CORRADE_INTERNAL_ASSERT(false);
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
     target = {};
 }

src/Magnum/Query.h

@@ -477,12 +477,12 @@ class TimeQuery: public AbstractQuery {
          * @see @fn_gl{QueryCounter} with @def_gl{TIMESTAMP}
          */
         void timestamp() {
-            /** @todo Enable when extension wrangler for ES is available */
             #ifndef MAGNUM_TARGET_GLES
             glQueryCounter(id(), GL_TIMESTAMP);
+            #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+            glQueryCounterEXT(id(), GL_TIMESTAMP_EXT);
             #else
-            //glQueryCounterEXT(id(), GL_TIMESTAMP);
-            CORRADE_INTERNAL_ASSERT(false);
+            CORRADE_ASSERT_UNREACHABLE();
             #endif
         }
 

src/Magnum/Renderbuffer.cpp

@@ -114,24 +114,34 @@ void Renderbuffer::storageImplementationDSA(RenderbufferFormat internalFormat, c
 }
 #endif
 
-/** @todo Re-enable when extension loader is available for ES */
-
 #ifndef MAGNUM_TARGET_GLES2
 void Renderbuffer::storageMultisampleImplementationDefault(const GLsizei samples, const RenderbufferFormat internalFormat, const Vector2i& size) {
     bind();
     glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, GLenum(internalFormat), size.x(), size.y());
 }
 #else
-void Renderbuffer::storageMultisampleImplementationANGLE(GLsizei, RenderbufferFormat, const Vector2i&) {
-    CORRADE_INTERNAL_ASSERT(false);
+void Renderbuffer::storageMultisampleImplementationANGLE(const GLsizei samples, const RenderbufferFormat internalFormat, const Vector2i& size) {
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
     bind();
-    //glRenderbufferStorageMultisampleANGLE(GL_RENDERBUFFER, samples, internalFormat, size.x(), size.y());
+    glRenderbufferStorageMultisampleANGLE(GL_RENDERBUFFER, samples, GLenum(internalFormat), size.x(), size.y());
+    #else
+    static_cast<void>(samples);
+    static_cast<void>(internalFormat);
+    static_cast<void>(size);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 
-void Renderbuffer::storageMultisampleImplementationNV(GLsizei, RenderbufferFormat, const Vector2i&) {
-    CORRADE_INTERNAL_ASSERT(false);
+void Renderbuffer::storageMultisampleImplementationNV(const GLsizei samples, const RenderbufferFormat internalFormat, const Vector2i& size) {
+    #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
     bind();
-    //glRenderbufferStorageMultisampleNV(GL_RENDERBUFFER, samples, internalFormat, size.x(), size.y());
+    glRenderbufferStorageMultisampleNV(GL_RENDERBUFFER, samples, GLenum(internalFormat), size.x(), size.y());
+    #else
+    static_cast<void>(samples);
+    static_cast<void>(internalFormat);
+    static_cast<void>(size);
+    CORRADE_ASSERT_UNREACHABLE();
+    #endif
 }
 #endif
 

src/Magnum/Renderer.cpp

@@ -212,12 +212,12 @@ Renderer::GraphicsResetStatus Renderer::graphicsResetStatusImplementationDefault
 }
 
 Renderer::GraphicsResetStatus Renderer::graphicsResetStatusImplementationRobustness() {
-    /** @todo Re-enable when extension loader is available for ES */
     #ifndef MAGNUM_TARGET_GLES
     return GraphicsResetStatus(glGetGraphicsResetStatusARB());
+    #elif !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_NACL)
+    return GraphicsResetStatus(glGetGraphicsResetStatusEXT());
     #else
-    CORRADE_INTERNAL_ASSERT(false);
-    //return GraphicsResetStatus(glGetGraphicsResetStatusEXT());
+    CORRADE_ASSERT_UNREACHABLE();
     #endif
 }
 

src/Magnum/Sampler.h

@@ -206,13 +206,14 @@ class MAGNUM_EXPORT Sampler {
             Greater = GL_GREATER
         };
 
-        #ifndef MAGNUM_TARGET_GLES
+        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @brief Depth/stencil texture mode
          *
          * @see @ref Texture::setDepthStencilMode() "*Texture::setDepthStencilMode()"
          * @requires_gl43 %Extension @extension{ARB,stencil_texturing}
-         * @requires_gl Stencil texturing is not available in OpenGL ES.
+         * @requires_gles31 Stencil texturing is not available in OpenGL ES 3.0
+         *      and older
          */
         enum class DepthStencilMode: GLenum {
             /** Sample depth component */

src/Magnum/Shader.cpp

@@ -57,6 +57,8 @@ std::string shaderName(const Shader::Type type) {
         case Shader::Type::Geometry:                return "geometry";
         case Shader::Type::TessellationControl:     return "tessellation control";
         case Shader::Type::TessellationEvaluation:  return "tessellation evaluation";
+        #endif
+        #ifndef MAGNUM_TARGET_GLES2
         case Shader::Type::Compute:                 return "compute";
         #endif
         case Shader::Type::Fragment:                return "fragment";
@@ -69,11 +71,13 @@ UnsignedInt typeToIndex(const Shader::Type type) {
     switch(type) {
         case Shader::Type::Vertex:                  return 0;
         case Shader::Type::Fragment:                return 1;
+        #ifndef MAGNUM_TARGET_GLES2
+        case Shader::Type::Compute:                 return 2;
+        #endif
         #ifndef MAGNUM_TARGET_GLES
-        case Shader::Type::Geometry:                return 2;
-        case Shader::Type::TessellationControl:     return 3;
-        case Shader::Type::TessellationEvaluation:  return 4;
-        case Shader::Type::Compute:                 return 5;
+        case Shader::Type::Geometry:                return 3;
+        case Shader::Type::TessellationControl:     return 4;
+        case Shader::Type::TessellationEvaluation:  return 5;
         #endif
     }
 
@@ -249,10 +253,18 @@ Int Shader::maxFragmentInputComponents() {
     return value;
 }
 
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 Int Shader::maxAtomicCounterBuffers(const Type type) {
-    if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_atomic_counters>() || !isTypeSupported(type))
+    if(
+        #ifndef MAGNUM_TARGET_GLES
+        !Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_atomic_counters>() ||
+        #else
+        !Context::current()->isVersionSupported(Version::GLES310) ||
+        #endif
+        !isTypeSupported(type))
+    {
         return 0;
+    }
 
     const UnsignedInt index = typeToIndex(type);
     GLint& value = Context::current()->state().shader->maxAtomicCounterBuffers[index];
@@ -261,10 +273,14 @@ Int Shader::maxAtomicCounterBuffers(const Type type) {
     constexpr static GLenum what[] = {
         GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS,
         GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS,
+        #ifndef MAGNUM_TARGET_GLES2
+        GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS,
+        #endif
+        #ifndef MAGNUM_TARGET_GLES
         GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS,
         GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS,
-        GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS,
-        GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS
+        GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS
+        #endif
     };
     if(value == 0)
         glGetIntegerv(what[index], &value);
@@ -273,7 +289,11 @@ Int Shader::maxAtomicCounterBuffers(const Type type) {
 }
 
 Int Shader::maxCombinedAtomicCounterBuffers() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_atomic_counters>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().shader->maxCombinedAtomicCounterBuffers;
@@ -286,8 +306,16 @@ Int Shader::maxCombinedAtomicCounterBuffers() {
 }
 
 Int Shader::maxAtomicCounters(const Type type) {
-    if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_atomic_counters>() || !isTypeSupported(type))
+    if(
+        #ifndef MAGNUM_TARGET_GLES
+        !Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_atomic_counters>() ||
+        #else
+        !Context::current()->isVersionSupported(Version::GLES310) ||
+        #endif
+        !isTypeSupported(type))
+    {
         return 0;
+    }
 
     const UnsignedInt index = typeToIndex(type);
     GLint& value = Context::current()->state().shader->maxAtomicCounters[index];
@@ -296,10 +324,14 @@ Int Shader::maxAtomicCounters(const Type type) {
     constexpr static GLenum what[] = {
         GL_MAX_VERTEX_ATOMIC_COUNTERS,
         GL_MAX_FRAGMENT_ATOMIC_COUNTERS,
+        #ifndef MAGNUM_TARGET_GLES2
+        GL_MAX_COMPUTE_ATOMIC_COUNTERS,
+        #endif
+        #ifndef MAGNUM_TARGET_GLES
         GL_MAX_GEOMETRY_ATOMIC_COUNTERS,
         GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS,
         GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS,
-        GL_MAX_COMPUTE_ATOMIC_COUNTERS
+        #endif
     };
     if(value == 0)
         glGetIntegerv(what[index], &value);
@@ -308,7 +340,11 @@ Int Shader::maxAtomicCounters(const Type type) {
 }
 
 Int Shader::maxCombinedAtomicCounters() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_atomic_counters>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().shader->maxCombinedAtomicCounters;
@@ -321,8 +357,16 @@ Int Shader::maxCombinedAtomicCounters() {
 }
 
 Int Shader::maxImageUniforms(const Type type) {
-    if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_image_load_store>() || !isTypeSupported(type))
+    if(
+        #ifndef MAGNUM_TARGET_GLES
+        !Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_image_load_store>() ||
+        #else
+        !Context::current()->isVersionSupported(Version::GLES310) ||
+        #endif
+        !isTypeSupported(type))
+    {
         return 0;
+    }
 
     const UnsignedInt index = typeToIndex(type);
     GLint& value = Context::current()->state().shader->maxImageUniforms[index];
@@ -331,10 +375,14 @@ Int Shader::maxImageUniforms(const Type type) {
     constexpr static GLenum what[] = {
         GL_MAX_VERTEX_IMAGE_UNIFORMS,
         GL_MAX_FRAGMENT_IMAGE_UNIFORMS,
+        #ifndef MAGNUM_TARGET_GLES2
+        GL_MAX_COMPUTE_IMAGE_UNIFORMS,
+        #endif
+        #ifndef MAGNUM_TARGET_GLES
         GL_MAX_GEOMETRY_IMAGE_UNIFORMS,
         GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS,
-        GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS,
-        GL_MAX_COMPUTE_IMAGE_UNIFORMS
+        GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS
+        #endif
     };
     if(value == 0)
         glGetIntegerv(what[index], &value);
@@ -343,7 +391,11 @@ Int Shader::maxImageUniforms(const Type type) {
 }
 
 Int Shader::maxCombinedImageUniforms() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_image_load_store>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().shader->maxCombinedImageUniforms;
@@ -356,8 +408,16 @@ Int Shader::maxCombinedImageUniforms() {
 }
 
 Int Shader::maxShaderStorageBlocks(const Type type) {
-    if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_storage_buffer_object>() || !isTypeSupported(type))
+    if(
+        #ifndef MAGNUM_TARGET_GLES
+        !Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_storage_buffer_object>() ||
+        #else
+        !Context::current()->isVersionSupported(Version::GLES310) ||
+        #endif
+        !isTypeSupported(type))
+    {
         return 0;
+    }
 
     const UnsignedInt index = typeToIndex(type);
     GLint& value = Context::current()->state().shader->maxShaderStorageBlocks[index];
@@ -366,10 +426,14 @@ Int Shader::maxShaderStorageBlocks(const Type type) {
     constexpr static GLenum what[] = {
         GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS,
         GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS,
+        #ifndef MAGNUM_TARGET_GLES2
+        GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS,
+        #endif
+        #ifndef MAGNUM_TARGET_GLES
         GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS,
         GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS,
-        GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS,
-        GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS
+        GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS
+        #endif
     };
     if(value == 0)
         glGetIntegerv(what[index], &value);
@@ -378,7 +442,11 @@ Int Shader::maxShaderStorageBlocks(const Type type) {
 }
 
 Int Shader::maxCombinedShaderStorageBlocks() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shader_atomic_counters>())
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+    #endif
         return 0;
 
     GLint& value = Context::current()->state().shader->maxCombinedShaderStorageBlocks;
@@ -402,11 +470,13 @@ Int Shader::maxTextureImageUnits(const Type type) {
     constexpr static GLenum what[] = {
         GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS,
         GL_MAX_TEXTURE_IMAGE_UNITS,
+        #ifndef MAGNUM_TARGET_GLES2
+        GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS,
+        #endif
         #ifndef MAGNUM_TARGET_GLES
         GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS,
         GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS,
-        GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS,
-        GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS
+        GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS
         #endif
     };
     if(value == 0)
@@ -441,11 +511,13 @@ Int Shader::maxUniformBlocks(const Type type) {
     constexpr static GLenum what[] = {
         GL_MAX_VERTEX_UNIFORM_BLOCKS,
         GL_MAX_FRAGMENT_UNIFORM_BLOCKS,
+        #ifndef MAGNUM_TARGET_GLES2
+        GL_MAX_COMPUTE_UNIFORM_BLOCKS,
+        #endif
         #ifndef MAGNUM_TARGET_GLES
         GL_MAX_GEOMETRY_UNIFORM_BLOCKS,
         GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS,
-        GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS,
-        GL_MAX_COMPUTE_UNIFORM_BLOCKS
+        GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS
         #endif
     };
     if(value == 0)
@@ -482,11 +554,11 @@ Int Shader::maxUniformComponents(const Type type) {
     constexpr static GLenum what[] = {
         GL_MAX_VERTEX_UNIFORM_COMPONENTS,
         GL_MAX_FRAGMENT_UNIFORM_COMPONENTS,
+        GL_MAX_COMPUTE_UNIFORM_COMPONENTS,
         #ifndef MAGNUM_TARGET_GLES
         GL_MAX_GEOMETRY_UNIFORM_COMPONENTS,
         GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS,
-        GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS,
-        GL_MAX_COMPUTE_UNIFORM_COMPONENTS
+        GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS
         #endif
     };
     if(value == 0)
@@ -523,11 +595,13 @@ Int Shader::maxCombinedUniformComponents(const Type type) {
     constexpr static GLenum what[] = {
         GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS,
         GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS,
+        #ifndef MAGNUM_TARGET_GLES2
+        GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS,
+        #endif
         #ifndef MAGNUM_TARGET_GLES
         GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS,
         GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS,
-        GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS,
-        GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS
+        GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS
         #endif
     };
     if(value == 0)
@@ -555,6 +629,7 @@ Shader::Shader(const Version version, const Type type): _type(type), _id(0) {
         #else
         case Version::GLES200: _sources.push_back("#version 100\n"); return;
         case Version::GLES300: _sources.push_back("#version 300 es\n"); return;
+        case Version::GLES310: _sources.push_back("#version 310 es\n"); return;
         #endif
 
         /* The user is responsible for (not) adding #version directive */
@@ -736,6 +811,8 @@ Debug operator<<(Debug debug, const Shader::Type value) {
         _c(TessellationControl)
         _c(TessellationEvaluation)
         _c(Geometry)
+        #endif
+        #ifndef MAGNUM_TARGET_GLES2
         _c(Compute)
         #endif
         _c(Fragment)

src/Magnum/Shader.h

@@ -92,11 +92,14 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
              * @requires_gl Geometry shaders are not available in OpenGL ES.
              */
             Geometry = GL_GEOMETRY_SHADER,
+            #endif
 
+            #ifndef MAGNUM_TARGET_GLES2
             /**
              * Compute shader
              * @requires_gl43 %Extension @extension{ARB,compute_shader}
-             * @requires_gl Compute shaders are not available in OpenGL ES.
+             * @requires_gles31 Compute shaders are not available in OpenGL ES
+             *      3.0 and older
              */
             Compute = GL_COMPUTE_SHADER,
             #endif
@@ -123,8 +126,8 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported component count of tessellation control shader input vertex
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,tessellation_shader}
-         * is not available, returns `0`.
+         * OpenGL calls. If extension @extension{ARB,tessellation_shader} (part
+         * of OpenGL 4.0) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_TESS_CONTROL_INPUT_COMPONENTS}
          * @requires_gl Tessellation shaders are not available in OpenGL ES.
          */
@@ -134,8 +137,8 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported component count of tessellation control shader output vertex
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,tessellation_shader}
-         * is not available, returns `0`.
+         * OpenGL calls. If extension @extension{ARB,tessellation_shader} (part
+         * of OpenGL 4.0) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_TESS_CONTROL_OUTPUT_COMPONENTS}
          * @requires_gl Tessellation shaders are not available in OpenGL ES.
          */
@@ -145,8 +148,8 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported component count of all tessellation control shader output vertices combined
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,tessellation_shader}
-         * is not available, returns `0`.
+         * OpenGL calls. If extension @extension{ARB,tessellation_shader} (part
+         * of OpenGL 4.0) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS}
          * @requires_gl Tessellation shaders are not available in OpenGL ES.
          */
@@ -156,8 +159,8 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported component count of tessellation evaluation shader input vertex
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,tessellation_shader}
-         * is not available, returns `0`.
+         * OpenGL calls. If extension @extension{ARB,tessellation_shader} (part
+         * of OpenGL 4.0) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_TESS_EVALUATION_INPUT_COMPONENTS}
          * @requires_gl Tessellation shaders are not available in OpenGL ES.
          */
@@ -167,8 +170,8 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported component count of tessellation evaluation shader output vertex
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,tessellation_shader}
-         * is not available, returns `0`.
+         * OpenGL calls. If extension @extension{ARB,tessellation_shader} (part
+         * of OpenGL 4.0) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_TESS_EVALUATION_OUTPUT_COMPONENTS}
          * @requires_gl Tessellation shaders are not available in OpenGL ES.
          */
@@ -178,8 +181,8 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported component count of geometry shader input vertex
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,geometry_shader4}
-         * is not available, returns `0`.
+         * OpenGL calls. If extension @extension{ARB,geometry_shader4} (part of
+         * OpenGL 3.2) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_GEOMETRY_INPUT_COMPONENTS}
          * @requires_gl Geometry shaders are not available in OpenGL ES.
          */
@@ -189,8 +192,8 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported component count of geometry shader output vertex
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,geometry_shader4}
-         * is not available, returns `0`.
+         * OpenGL calls. If extension @extension{ARB,geometry_shader4} (part of
+         * OpenGL 3.2) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_GEOMETRY_OUTPUT_COMPONENTS}
          * @requires_gl Geometry shaders are not available in OpenGL ES.
          */
@@ -200,8 +203,8 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported component count of all geometry shader output vertices combined
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,geometry_shader4}
-         * is not available, returns `0`.
+         * OpenGL calls. If extension @extension{ARB,geometry_shader4} (part of
+         * OpenGL 3.2) is not available, returns `0`.
          * @see @fn_gl{Get} with @def_gl{MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS}
          * @requires_gl Geometry shaders are not available in OpenGL ES.
          */
@@ -239,13 +242,14 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          */
         static Int maxUniformComponents(Type type);
 
-        #ifndef MAGNUM_TARGET_GLES
+        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @brief Max supported atomic counter buffer count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_atomic_counters} or
-         * particular shader stage is not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_atomic_counters}
+         * (part of OpenGL 4.2) nor OpenGL ES 3.1 is available or if particular
+         * shader stage is not available, returns `0`.
          * @see @ref maxCombinedAtomicCounterBuffers(), @ref maxAtomicCounters(),
          *      @fn_gl{Get} with @def_gl{MAX_VERTEX_ATOMIC_COUNTER_BUFFERS},
          *      @def_gl{MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS},
@@ -253,7 +257,7 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          *      @def_gl{MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS},
          *      @def_gl{MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS} or
          *      @def_gl{MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS}
-         * @requires_gl Atomic counters are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxAtomicCounterBuffers(Type type);
 
@@ -261,11 +265,11 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported atomic counter buffer count for all stages combined
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_atomic_counters} is
-         * not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_atomic_counters}
+         * (part of OpenGL 4.2) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @ref maxAtomicCounterBuffers(), @ref maxCombinedAtomicCounters(),
          *      @fn_gl{Get} with @def_gl{MAX_COMBINED_ATOMIC_COUNTER_BUFFERS}
-         * @requires_gl Atomic counters are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxCombinedAtomicCounterBuffers();
 
@@ -273,8 +277,9 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported atomic counter count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_atomic_counters} or
-         * particular shader stage is not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_atomic_counters}
+         * (part of OpenGL 4.2) nor OpenGL ES 3.1 is available or if particular
+         * shader stage is not available, returns `0`.
          * @see @ref maxCombinedAtomicCounters(), @ref maxAtomicCounterBuffers(),
          *      @fn_gl{Get} with @def_gl{MAX_VERTEX_ATOMIC_COUNTERS},
          *      @def_gl{MAX_TESS_CONTROL_ATOMIC_COUNTERS},
@@ -282,7 +287,7 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          *      @def_gl{MAX_GEOMETRY_ATOMIC_COUNTERS},
          *      @def_gl{MAX_COMPUTE_ATOMIC_COUNTERS} or
          *      @def_gl{MAX_FRAGMENT_ATOMIC_COUNTERS}
-         * @requires_gl Atomic counters are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxAtomicCounters(Type type);
 
@@ -290,11 +295,11 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported atomic counter count for all stages combined
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_atomic_counters} is
-         * not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_atomic_counters}
+         * (part of OpenGL 4.2) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @ref maxAtomicCounters(), @ref maxCombinedAtomicCounterBuffers(),
          *      @fn_gl{Get} with @def_gl{MAX_COMBINED_ATOMIC_COUNTERS}
-         * @requires_gl Atomic counters are not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxCombinedAtomicCounters();
 
@@ -302,8 +307,9 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported image uniform count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_image_load_store}
-         * or particular shader stage is not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_image_load_store}
+         * (part of OpenGL 4.2) nor OpenGL ES 3.1 is available or if particular
+         * shader stage is not available, returns `0`.
          * @see @ref maxCombinedImageUniforms(),
          *      @fn_gl{Get} with @def_gl{MAX_VERTEX_IMAGE_UNIFORMS},
          *      @def_gl{MAX_TESS_CONTROL_IMAGE_UNIFORMS},
@@ -311,7 +317,7 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          *      @def_gl{MAX_GEOMETRY_IMAGE_UNIFORMS},
          *      @def_gl{MAX_COMPUTE_IMAGE_UNIFORMS} or
          *      @def_gl{MAX_FRAGMENT_IMAGE_UNIFORMS}
-         * @requires_gl %Image load/store is not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxImageUniforms(Type type);
 
@@ -319,11 +325,11 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported image uniform count for all stages combined
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_image_load_store}
-         * is not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_image_load_store}
+         * (part of OpenGL 4.2) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @ref maxImageUniforms(),
          *      @fn_gl{Get} with @def_gl{MAX_COMBINED_IMAGE_UNIFORMS}
-         * @requires_gl %Image load/store is not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxCombinedImageUniforms();
 
@@ -331,8 +337,9 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported shader storage block count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_storage_buffer_object}
-         * or particular shader stage is not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_storage_buffer_object}
+         * (part of OpenGL 4.3) nor OpenGL ES 3.1 is available or if particular
+         * shader stage is not available, returns `0`.
          * @see @ref maxCombinedShaderStorageBlocks(),
          *      @fn_gl{Get} with @def_gl{MAX_VERTEX_SHADER_STORAGE_BLOCKS},
          *      @def_gl{MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS},
@@ -340,7 +347,7 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          *      @def_gl{MAX_GEOMETRY_SHADER_STORAGE_BLOCKS},
          *      @def_gl{MAX_COMPUTE_SHADER_STORAGE_BLOCKS} or
          *      @def_gl{MAX_FRAGMENT_SHADER_STORAGE_BLOCKS}
-         * @requires_gl %Shader storage is not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxShaderStorageBlocks(Type type);
 
@@ -348,11 +355,11 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported shader storage block count for all stages combined
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,shader_storage_buffer_object}
-         * is not available, returns `0`.
+         * OpenGL calls. If neither extension @extension{ARB,shader_storage_buffer_object}
+         * (part of OpenGL 4.3) nor OpenGL ES 3.1 is available, returns `0`.
          * @see @ref maxShaderStorageBlocks(),
          *      @fn_gl{Get} with @def_gl{MAX_COMBINED_SHADER_STORAGE_BLOCKS}
-         * @requires_gl %Shader storage is not available in OpenGL ES.
+         * @requires_gles30 Not defined in OpenGL ES 2.0
          */
         static Int maxCombinedShaderStorageBlocks();
         #endif
@@ -388,8 +395,9 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported uniform block count
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,uniform_buffer_objects} or
-         * particular shader stage is not available, returns `0`.
+         * OpenGL calls. If extension @extension{ARB,uniform_buffer_objects}
+         * (part of OpenGL 3.1) or particular shader stage is not available,
+         * returns `0`.
          * @see @ref maxCombinedUniformBlocks(), @ref maxUniformComponents(),
          *      @ref maxCombinedUniformComponents(),
          *      @fn_gl{Get} with @def_gl{MAX_VERTEX_UNIFORM_BLOCKS},
@@ -406,23 +414,22 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * @brief Max supported uniform block count for all stages combined
          *
          * The result is cached, repeated queries don't result in repeated
-         * OpenGL calls. If extension @extension{ARB,uniform_buffer_objects} is
-         * not available, returns `0`.
+         * OpenGL calls. If extension @extension{ARB,uniform_buffer_objects}
+         * (part of OpenGL 3.1) is not available, returns `0`.
          * @see @ref maxUniformBlocks(), @ref maxUniformComponents(),
          *      @ref maxCombinedUniformComponents(),
          *      @fn_gl{Get} with @def_gl{MAX_COMBINED_UNIFORM_BLOCKS}
          * @requires_gles30 Uniform blocks are not available in OpenGL ES 2.0.
          */
         static Int maxCombinedUniformBlocks();
-        #endif
 
-        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @brief Max supported uniform component count in all blocks combined
          *
          * The result is cached, repeated queries don't result in repeated
          * OpenGL calls. If extension @extension{ARB,uniform_buffer_objects}
-         * or particular shader stage is not available, returns `0`.
+         * (part of OpenGL 3.1) or particular shader stage is not available,
+         * returns `0`.
          * @see @ref maxUniformComponents(), @ref maxUniformBlocks(),
          *      @fn_gl{Get} with @def_gl{MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS},
          *      @def_gl{MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS},

src/Magnum/Test/CMakeLists.txt

@@ -78,14 +78,14 @@ if(BUILD_GL_TESTS)
     corrade_add_test(ShaderGLTest ShaderGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES})
 
     if(NOT MAGNUM_TARGET_GLES2)
-        corrade_add_test(TextureArrayGLTest TextureArrayGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES})
         corrade_add_test(BufferImageGLTest BufferImageGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES})
+        corrade_add_test(TextureArrayGLTest TextureArrayGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES})
+        corrade_add_test(MultisampleTextureGLTest MultisampleTextureGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES})
     endif()
 
     if(NOT MAGNUM_TARGET_GLES)
         corrade_add_test(BufferTextureGLTest BufferTextureGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES})
         corrade_add_test(CubeMapTextureArrayGLTest CubeMapTextureArrayGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES})
-        corrade_add_test(MultisampleTextureGLTest MultisampleTextureGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES})
         corrade_add_test(RectangleTextureGLTest RectangleTextureGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES})
     endif()
 endif()

src/Magnum/Test/CubeMapTextureGLTest.cpp

@@ -55,6 +55,8 @@ class CubeMapTextureGLTest: public AbstractOpenGLTester {
         #endif
         #ifndef MAGNUM_TARGET_GLES
         void samplingBorderInteger();
+        #endif
+        #ifndef MAGNUM_TARGET_GLES2
         void samplingDepthStencilMode();
         #endif
 
@@ -90,6 +92,8 @@ CubeMapTextureGLTest::CubeMapTextureGLTest() {
               #endif
               #ifndef MAGNUM_TARGET_GLES
               &CubeMapTextureGLTest::samplingBorderInteger,
+              #endif
+              #ifndef MAGNUM_TARGET_GLES2
               &CubeMapTextureGLTest::samplingDepthStencilMode,
               #endif
 
@@ -235,10 +239,17 @@ void CubeMapTextureGLTest::samplingBorderInteger() {
 
     MAGNUM_VERIFY_NO_ERROR();
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES2
 void CubeMapTextureGLTest::samplingDepthStencilMode() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::stencil_texturing>())
         CORRADE_SKIP(Extensions::GL::ARB::stencil_texturing::string() + std::string(" is not supported."));
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 not supported.");
+    #endif
 
     CubeMapTexture texture;
     texture.setDepthStencilMode(Sampler::DepthStencilMode::StencilIndex);
@@ -253,8 +264,12 @@ void CubeMapTextureGLTest::storage() {
 
     MAGNUM_VERIFY_NO_ERROR();
 
-    /** @todo How to test this on ES? */
-    #ifndef MAGNUM_TARGET_GLES
+    #ifndef MAGNUM_TARGET_GLES2
+    #ifdef MAGNUM_TARGET_GLES
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 not supported, skipping image size testing");
+    #endif
+
     CORRADE_COMPARE(texture.imageSize(CubeMapTexture::Coordinate::PositiveX, 0), Vector2i(32));
     CORRADE_COMPARE(texture.imageSize(CubeMapTexture::Coordinate::NegativeX, 0), Vector2i(32));
     CORRADE_COMPARE(texture.imageSize(CubeMapTexture::Coordinate::PositiveY, 0), Vector2i(32));

src/Magnum/Test/FramebufferGLTest.cpp

@@ -38,12 +38,12 @@
 
 #ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#include "Magnum/MultisampleTexture.h"
 #include "Magnum/TextureArray.h"
 #endif
 
 #ifndef MAGNUM_TARGET_GLES
 #include "Magnum/CubeMapTextureArray.h"
-#include "Magnum/MultisampleTexture.h"
 #include "Magnum/RectangleTexture.h"
 #endif
 
@@ -72,9 +72,9 @@ class FramebufferGLTest: public AbstractOpenGLTester {
         #endif
         #ifndef MAGNUM_TARGET_GLES2
         void attachTexture2DArray();
+        void attachTexture2DMultisample();
         #endif
         #ifndef MAGNUM_TARGET_GLES
-        void attachTexture2DMultisample();
         void attachTexture2DMultisampleArray();
         void attachRectangleTexture();
         #endif
@@ -120,9 +120,9 @@ FramebufferGLTest::FramebufferGLTest() {
               #endif
               #ifndef MAGNUM_TARGET_GLES2
               &FramebufferGLTest::attachTexture2DArray,
+              &FramebufferGLTest::attachTexture2DMultisample,
               #endif
               #ifndef MAGNUM_TARGET_GLES
-              &FramebufferGLTest::attachTexture2DMultisample,
               &FramebufferGLTest::attachTexture2DMultisampleArray,
               &FramebufferGLTest::attachRectangleTexture,
               #endif
@@ -472,12 +472,17 @@ void FramebufferGLTest::attachTexture2DArray() {
 }
 #endif
 
-#ifndef MAGNUM_TARGET_GLES
+#ifndef MAGNUM_TARGET_GLES2
 void FramebufferGLTest::attachTexture2DMultisample() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::framebuffer_object>())
         CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available."));
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::GL::ARB::texture_multisample::string() + std::string(" is not available."));
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 is not supported.");
+    #endif
 
     MultisampleTexture2D color;
     color.setStorage(4, TextureFormat::RGBA8, {128, 128});
@@ -492,7 +497,9 @@ void FramebufferGLTest::attachTexture2DMultisample() {
     MAGNUM_VERIFY_NO_ERROR();
     CORRADE_COMPARE(framebuffer.checkStatus(FramebufferTarget::ReadDraw), Framebuffer::Status::Complete);
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES
 void FramebufferGLTest::attachTexture2DMultisampleArray() {
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::framebuffer_object>())
         CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available."));

src/Magnum/Test/MultisampleTextureGLTest.cpp

@@ -37,41 +37,67 @@ class MultisampleTextureGLTest: public AbstractOpenGLTester {
         explicit MultisampleTextureGLTest();
 
         void construct2D();
+        #ifndef MAGNUM_TARGET_GLES
         void construct2DArray();
+        #endif
 
         void bind2D();
+        #ifndef MAGNUM_TARGET_GLES
         void bind2DArray();
+        #endif
 
         void storage2D();
+        #ifndef MAGNUM_TARGET_GLES
         void storage2DArray();
+        #endif
 
         void invalidateImage2D();
+        #ifndef MAGNUM_TARGET_GLES
         void invalidateImage2DArray();
+        #endif
 
         void invalidateSubImage2D();
+        #ifndef MAGNUM_TARGET_GLES
         void invalidateSubImage2DArray();
+        #endif
 };
 
 MultisampleTextureGLTest::MultisampleTextureGLTest() {
     addTests({&MultisampleTextureGLTest::construct2D,
+              #ifndef MAGNUM_TARGET_GLES
               &MultisampleTextureGLTest::construct2DArray,
+              #endif
 
               &MultisampleTextureGLTest::bind2D,
+              #ifndef MAGNUM_TARGET_GLES
               &MultisampleTextureGLTest::bind2DArray,
+              #endif
 
               &MultisampleTextureGLTest::storage2D,
+              #ifndef MAGNUM_TARGET_GLES
               &MultisampleTextureGLTest::storage2DArray,
+              #endif
 
               &MultisampleTextureGLTest::invalidateImage2D,
+              #ifndef MAGNUM_TARGET_GLES
               &MultisampleTextureGLTest::invalidateImage2DArray,
+              #endif
 
               &MultisampleTextureGLTest::invalidateSubImage2D,
-              &MultisampleTextureGLTest::invalidateSubImage2DArray});
+              #ifndef MAGNUM_TARGET_GLES
+              &MultisampleTextureGLTest::invalidateSubImage2DArray
+              #endif
+              });
 }
 
 void MultisampleTextureGLTest::construct2D() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::GL::ARB::texture_multisample::string() + std::string(" is not supported."));
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 is not supported.");
+    #endif
 
     {
         MultisampleTexture2D texture;
@@ -83,6 +109,7 @@ void MultisampleTextureGLTest::construct2D() {
     MAGNUM_VERIFY_NO_ERROR();
 }
 
+#ifndef MAGNUM_TARGET_GLES
 void MultisampleTextureGLTest::construct2DArray() {
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::GL::ARB::texture_multisample::string() + std::string(" is not supported."));
@@ -96,18 +123,26 @@ void MultisampleTextureGLTest::construct2DArray() {
 
     MAGNUM_VERIFY_NO_ERROR();
 }
+#endif
 
 void MultisampleTextureGLTest::bind2D() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::GL::ARB::texture_multisample::string() + std::string(" is not supported."));
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 is not supported.");
+    #endif
 
     MultisampleTexture2D texture;
 
+    #ifndef MAGNUM_TARGET_GLES
     if(Context::current()->isExtensionSupported<Extensions::GL::ARB::multi_bind>()) {
         CORRADE_EXPECT_FAIL("With ARB_multi_bind the texture must be associated with given target at least once before binding it.");
         texture.setStorage(4, TextureFormat::RGBA8, {16, 16});
         CORRADE_VERIFY(false);
     }
+    #endif
 
     texture.bind(15);
 
@@ -122,6 +157,7 @@ void MultisampleTextureGLTest::bind2D() {
     MAGNUM_VERIFY_NO_ERROR();
 }
 
+#ifndef MAGNUM_TARGET_GLES
 void MultisampleTextureGLTest::bind2DArray() {
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::GL::ARB::texture_multisample::string() + std::string(" is not supported."));
@@ -146,10 +182,16 @@ void MultisampleTextureGLTest::bind2DArray() {
 
     MAGNUM_VERIFY_NO_ERROR();
 }
+#endif
 
 void MultisampleTextureGLTest::storage2D() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::GL::ARB::texture_multisample::string() + std::string(" is not supported."));
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 is not supported.");
+    #endif
 
     MultisampleTexture2D texture;
     texture.setStorage(4, TextureFormat::RGBA8, {16, 16});
@@ -161,6 +203,7 @@ void MultisampleTextureGLTest::storage2D() {
     MAGNUM_VERIFY_NO_ERROR();
 }
 
+#ifndef MAGNUM_TARGET_GLES
 void MultisampleTextureGLTest::storage2DArray() {
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::GL::ARB::texture_multisample::string() + std::string(" is not supported."));
@@ -174,10 +217,16 @@ void MultisampleTextureGLTest::storage2DArray() {
 
     MAGNUM_VERIFY_NO_ERROR();
 }
+#endif
 
 void MultisampleTextureGLTest::invalidateImage2D() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::GL::ARB::texture_multisample::string() + std::string(" is not supported."));
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 is not supported.");
+    #endif
 
     MultisampleTexture2D texture;
     texture.setStorage(4, TextureFormat::RGBA8, {16, 16});
@@ -186,6 +235,7 @@ void MultisampleTextureGLTest::invalidateImage2D() {
     MAGNUM_VERIFY_NO_ERROR();
 }
 
+#ifndef MAGNUM_TARGET_GLES
 void MultisampleTextureGLTest::invalidateImage2DArray() {
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::GL::ARB::texture_multisample::string() + std::string(" is not supported."));
@@ -196,10 +246,16 @@ void MultisampleTextureGLTest::invalidateImage2DArray() {
 
     MAGNUM_VERIFY_NO_ERROR();
 }
+#endif
 
 void MultisampleTextureGLTest::invalidateSubImage2D() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::GL::ARB::texture_multisample::string() + std::string(" is not supported."));
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 is not supported.");
+    #endif
 
     MultisampleTexture2D texture;
     texture.setStorage(4, TextureFormat::RGBA8, {16, 16});
@@ -208,6 +264,7 @@ void MultisampleTextureGLTest::invalidateSubImage2D() {
     MAGNUM_VERIFY_NO_ERROR();
 }
 
+#ifndef MAGNUM_TARGET_GLES
 void MultisampleTextureGLTest::invalidateSubImage2DArray() {
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::GL::ARB::texture_multisample::string() + std::string(" is not supported."));
@@ -218,6 +275,7 @@ void MultisampleTextureGLTest::invalidateSubImage2DArray() {
 
     MAGNUM_VERIFY_NO_ERROR();
 }
+#endif
 
 }}
 

src/Magnum/Test/TextureArrayGLTest.cpp

@@ -74,8 +74,11 @@ class TextureArrayGLTest: public AbstractOpenGLTester {
         void samplingBorderInteger1D();
         void samplingBorderInteger2D();
         void samplingDepthStencilMode1D();
+        #endif
+        #ifndef MAGNUM_TARGET_GLES2
         void samplingDepthStencilMode2D();
-        #else
+        #endif
+        #ifdef MAGNUM_TARGET_GLES
         void samplingBorder2D();
         #endif
 
@@ -457,19 +460,28 @@ void TextureArrayGLTest::samplingBorderInteger2D() {
 
     MAGNUM_VERIFY_NO_ERROR();
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES2
 void TextureArrayGLTest::samplingDepthStencilMode2D() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::EXT::texture_array>())
         CORRADE_SKIP(Extensions::GL::EXT::texture_array::string() + std::string(" is not supported."));
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::stencil_texturing>())
         CORRADE_SKIP(Extensions::GL::ARB::stencil_texturing::string() + std::string(" is not supported."));
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 is not supported.");
+    #endif
 
     Texture2DArray texture;
     texture.setDepthStencilMode(Sampler::DepthStencilMode::StencilIndex);
 
     MAGNUM_VERIFY_NO_ERROR();
 }
-#else
+#endif
+
+#ifdef MAGNUM_TARGET_GLES
 void TextureArrayGLTest::samplingBorder2D() {
     if(!Context::current()->isExtensionSupported<Extensions::GL::NV::texture_border_clamp>())
         CORRADE_SKIP(Extensions::GL::NV::texture_border_clamp::string() + std::string(" is not supported."));
@@ -514,8 +526,12 @@ void TextureArrayGLTest::storage2D() {
 
     MAGNUM_VERIFY_NO_ERROR();
 
-    /** @todo How to test this on ES? */
-    #ifndef MAGNUM_TARGET_GLES
+    #ifndef MAGNUM_TARGET_GLES2
+    #ifdef MAGNUM_TARGET_GLES
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 not supported, skipping image size testing");
+    #endif
+
     CORRADE_COMPARE(texture.imageSize(0), Vector3i(32, 32, 32));
     CORRADE_COMPARE(texture.imageSize(1), Vector3i(16, 16, 32));
     CORRADE_COMPARE(texture.imageSize(2), Vector3i( 8,  8, 32));

src/Magnum/Test/TextureGLTest.cpp

@@ -82,9 +82,12 @@ class TextureGLTest: public AbstractOpenGLTester {
         void samplingBorderInteger2D();
         void samplingBorderInteger3D();
         void samplingDepthStencilMode1D();
+        #endif
+        #ifndef MAGNUM_TARGET_GLES2
         void samplingDepthStencilMode2D();
         void samplingDepthStencilMode3D();
-        #else
+        #endif
+        #ifdef MAGNUM_TARGET_GLES
         void samplingBorder2D();
         void samplingBorder3D();
         #endif
@@ -184,9 +187,12 @@ TextureGLTest::TextureGLTest() {
         &TextureGLTest::samplingBorderInteger2D,
         &TextureGLTest::samplingBorderInteger3D,
         &TextureGLTest::samplingDepthStencilMode1D,
+        #endif
+        #ifndef MAGNUM_TARGET_GLES2
         &TextureGLTest::samplingDepthStencilMode2D,
         &TextureGLTest::samplingDepthStencilMode3D,
-        #else
+        #endif
+        #ifdef MAGNUM_TARGET_GLES
         &TextureGLTest::samplingBorder2D,
         &TextureGLTest::samplingBorder3D,
         #endif
@@ -499,17 +505,26 @@ void TextureGLTest::samplingBorderInteger2D() {
 
     MAGNUM_VERIFY_NO_ERROR();
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES2
 void TextureGLTest::samplingDepthStencilMode2D() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::stencil_texturing>())
         CORRADE_SKIP(Extensions::GL::ARB::stencil_texturing::string() + std::string(" is not supported."));
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 is not supported.");
+    #endif
 
     Texture2D texture;
     texture.setDepthStencilMode(Sampler::DepthStencilMode::StencilIndex);
 
     MAGNUM_VERIFY_NO_ERROR();
 }
-#else
+#endif
+
+#ifdef MAGNUM_TARGET_GLES
 void TextureGLTest::samplingBorder2D() {
     if(!Context::current()->isExtensionSupported<Extensions::GL::NV::texture_border_clamp>())
         CORRADE_SKIP(Extensions::GL::NV::texture_border_clamp::string() + std::string(" is not supported."));
@@ -607,17 +622,26 @@ void TextureGLTest::samplingBorderInteger3D() {
 
     MAGNUM_VERIFY_NO_ERROR();
 }
+#endif
 
+#ifndef MAGNUM_TARGET_GLES2
 void TextureGLTest::samplingDepthStencilMode3D() {
+    #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::stencil_texturing>())
         CORRADE_SKIP(Extensions::GL::ARB::stencil_texturing::string() + std::string(" is not supported."));
+    #else
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 is not supported.");
+    #endif
 
     Texture3D texture;
     texture.setDepthStencilMode(Sampler::DepthStencilMode::StencilIndex);
 
     MAGNUM_VERIFY_NO_ERROR();
 }
-#else
+#endif
+
+#ifdef MAGNUM_TARGET_GLES
 void TextureGLTest::samplingBorder3D() {
     #ifdef MAGNUM_TARGET_GLES2
     if(!Context::current()->isExtensionSupported<Extensions::GL::OES::texture_3D>())
@@ -659,8 +683,12 @@ void TextureGLTest::storage2D() {
 
     MAGNUM_VERIFY_NO_ERROR();
 
-    /** @todo How to test this on ES? */
-    #ifndef MAGNUM_TARGET_GLES
+    #ifndef MAGNUM_TARGET_GLES2
+    #ifdef MAGNUM_TARGET_GLES
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 not supported, skipping image size testing.");
+    #endif
+
     CORRADE_COMPARE(texture.imageSize(0), Vector2i(32));
     CORRADE_COMPARE(texture.imageSize(1), Vector2i(16));
     CORRADE_COMPARE(texture.imageSize(2), Vector2i( 8));
@@ -683,8 +711,12 @@ void TextureGLTest::storage3D() {
 
     MAGNUM_VERIFY_NO_ERROR();
 
-    /** @todo How to test this on ES? */
-    #ifndef MAGNUM_TARGET_GLES
+    #ifndef MAGNUM_TARGET_GLES2
+    #ifdef MAGNUM_TARGET_GLES
+    if(!Context::current()->isVersionSupported(Version::GLES310))
+        CORRADE_SKIP("OpenGL ES 3.1 not supported, skipping image size testing.");
+    #endif
+
     CORRADE_COMPARE(texture.imageSize(0), Vector3i(32));
     CORRADE_COMPARE(texture.imageSize(1), Vector3i(16));
     CORRADE_COMPARE(texture.imageSize(2), Vector3i( 8));

src/Magnum/Texture.h

@@ -195,7 +195,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
         constexpr CORRADE_DEPRECATED("use dedicated Texture, TextureArray, MultisampleTexture, RectangleTexture classes instead") Target target() const { return static_cast<Target>(_target); }
         #endif
 
-        #ifndef MAGNUM_TARGET_GLES
+        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @brief %Image size in given mip level
          *
@@ -206,7 +206,8 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
          *      @fn_gl{GetTexLevelParameter} or @fn_gl_extension{GetTextureLevelParameter,EXT,direct_state_access}
          *      with @def_gl{TEXTURE_WIDTH}, @def_gl{TEXTURE_HEIGHT} or
          *      @def_gl{TEXTURE_DEPTH}
-         * @requires_gl %Texture image queries are not available in OpenGL ES.
+         * @requires_gles31 %Texture image size queries are not available in
+         *      OpenGL ES 3.0 and older.
          */
         typename DimensionTraits<dimensions, Int>::VectorType imageSize(Int level) {
             return DataHelper<dimensions>::imageSize(*this, _target, level);
@@ -541,7 +542,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
             return *this;
         }
 
-        #ifndef MAGNUM_TARGET_GLES
+        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @brief Set depth/stencil texture mode
          * @return Reference to self (for method chaining)
@@ -555,7 +556,8 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
          *      or @fn_gl_extension{TextureParameter,EXT,direct_state_access}
          *      with @def_gl{DEPTH_STENCIL_TEXTURE_MODE}
          * @requires_gl43 %Extension @extension{ARB,stencil_texturing}
-         * @requires_gl Stencil texturing is not available in OpenGL ES.
+         * @requires_gles31 Stencil texturing is not available in OpenGL ES 3.0
+         *      and older.
          */
         Texture<dimensions>& setDepthStencilMode(Sampler::DepthStencilMode mode) {
             AbstractTexture::setDepthStencilMode(mode);

src/Magnum/TextureArray.h

@@ -236,7 +236,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
             return *this;
         }
 
-        #ifndef MAGNUM_TARGET_GLES
+        #ifndef MAGNUM_TARGET_GLES2
         /**
          * @copybrief Texture::setDepthStencilMode()
          * @return Reference to self (for method chaining)
@@ -249,7 +249,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
         }
         #endif
 
-        #ifndef MAGNUM_TARGET_GLES
+        #ifndef MAGNUM_TARGET_GLES2
         /** @copydoc Texture::imageSize() */
         typename DimensionTraits<dimensions+1, Int>::VectorType imageSize(Int level) {
             return DataHelper<dimensions+1>::imageSize(*this, _target, level);

src/Magnum/Version.cpp

@@ -48,6 +48,7 @@ Debug operator<<(Debug debug, Version value) {
         #else
         _c(GLES200, "OpenGL ES 2.0")
         _c(GLES300, "OpenGL ES 3.0")
+        _c(GLES310, "OpenGL ES 3.1")
         #endif
         #undef _c
     }

src/Magnum/Version.h

@@ -77,9 +77,13 @@ enum class Version: Int {
      * equivalent to @ref Version::GL430.
      */
     #ifndef MAGNUM_TARGET_GLES
-    GLES300 = 430
+    GLES300 = 430,
     #else
-    GLES300 = 300
+    GLES300 = 300,
+    #endif
+
+    #ifdef MAGNUM_TARGET_GLES
+    GLES310 = 310                   /**< @brief OpenGL ES 3.1, GLSL ES 3.10 */
     #endif
 };
 

src/MagnumExternal/OpenGL/CMakeLists.txt

@@ -27,8 +27,9 @@ if(NOT TARGET_GLES)
     add_subdirectory(GL)
 else()
     add_subdirectory(KHR)
-    add_subdirectory(GLES2)
-    if(NOT TARGET_GLES2)
+    if(TARGET_GLES2)
+        add_subdirectory(GLES2)
+    else()
         add_subdirectory(GLES3)
     endif()
 endif()

src/MagnumExternal/OpenGL/GL/flextGL.h

@@ -13,7 +13,7 @@
 #error Attempt to include auto-generated header after including glext.h
 #endif
 #if defined(__gltypes_h_)
-#error Attempt to include auto-generated header after gltypes.h
+#error Attempt to include auto-generated header after including gltypes.h
 #endif
 #if defined(__gl_ATI_h_)
 #error Attempt to include auto-generated header after including glATI.h

src/MagnumExternal/OpenGL/GL/flextGL.h.template

@@ -14,7 +14,7 @@
 #error Attempt to include auto-generated header after including glext.h
 #endif
 #if defined(__gltypes_h_)
-#error Attempt to include auto-generated header after gltypes.h
+#error Attempt to include auto-generated header after including gltypes.h
 #endif
 #if defined(__gl_ATI_h_)
 #error Attempt to include auto-generated header after including glATI.h

src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt

@@ -23,15 +23,25 @@
 #   DEALINGS IN THE SOFTWARE.
 #
 
-set(MagnumOpenGL_HEADERS
-    gl2ext.h)
+# NaCl and Emscripten don't have the ability to load function pointers manually
+if(NOT CORRADE_TARGET_NACL AND NOT CORRADE_TARGET_EMSCRIPTEN)
+    # flextGLPlatform.cpp is compiled as part of Magnum*Context libraries in Platform
+    add_library(MagnumFlextGLObjects OBJECT flextGL.cpp)
 
-# We need gl2ext.h also for ES3 (but not the others). NaCl has its own gl2.h,
-# this one causes linker issues
-if(TARGET_GLES2 AND NOT CORRADE_TARGET_NACL)
-    set(MagnumOpenGL_HEADERS ${MagnumOpenGL_HEADERS}
-        gl2platform.h
-        gl2.h)
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?Clang")
+        set_target_properties(MagnumFlextGLObjects PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -fvisibility=hidden -DFlextGL_EXPORTS")
+    else()
+        set_target_properties(MagnumFlextGLObjects PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -DFlextGL_EXPORTS")
+    endif()
+endif()
+
+# NaCl and Emscripten are special, provide only some extensions for them
+if(CORRADE_TARGET_NACL)
+    set(MagnumOpenGL_HEADERS flextGLNaCl.h)
+elseif(CORRADE_TARGET_EMSCRIPTEN)
+    set(MagnumOpenGL_HEADERS flextGLEmscripten.h)
+else()
+    set(MagnumOpenGL_HEADERS flextGL.h)
 endif()
 
 install(FILES ${MagnumOpenGL_HEADERS} DESTINATION ${MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR}/OpenGL/GLES2)

src/MagnumExternal/OpenGL/GLES2/Emscripten/flextGLEmscripten.h.template

@@ -0,0 +1,56 @@
+@require(passthru, functions, enums, options, version, extensions)
+#ifndef _flextgl_h_
+#define _flextgl_h_
+
+/* Defensive include guards */
+
+#if defined(__gl2_h_)
+#error Attempt to include auto-generated header after including gl2.h
+#endif
+#if defined(__gl2ext_h_)
+#error Attempt to include auto-generated header after including gl2ext.h
+#endif
+#if defined(__gl2platform_h_)
+#error Attempt to include auto-generated header after including gl2platform.h
+#endif
+
+#define __gl2_h_
+#define __gl2ext_h_
+#define __gl2platform_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void flextGLInit();
+
+/* Function declaration macros */
+#define APIENTRY
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/* Data types */
+
+@passthru
+
+/* Enums */
+
+@enums
+
+/* Function prototypes */
+@for cat,funcs in functions:
+
+/* GL_@cat */
+
+@for f in funcs:
+GLAPI @f.returntype gl@f.name\
+(@f.param_type_list_string());
+@end
+@end
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

src/MagnumExternal/OpenGL/GLES2/NaCl/flextGLNaCl.h.template

@@ -0,0 +1,60 @@
+@require(passthru, functions, enums, options, version, extensions)
+#ifndef _flextgl_h_
+#define _flextgl_h_
+
+/* Defensive include guards */
+
+#if defined(__gl2_h_)
+#error Attempt to include auto-generated header after including gl2.h
+#endif
+#if defined(__gl2platform_h_)
+#error Attempt to include auto-generated header after including gl2platform.h
+#endif
+
+#define __gl2_h_
+#define __gl2platform_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void flextGLInit();
+
+/* Function declaration macros */
+#define FLEXTGL_EXPORT __attribute__ ((visibility ("default")))
+
+#define APIENTRY
+#ifndef GL_APICALL
+#define GL_APICALL  KHRONOS_APICALL
+#endif
+#ifndef GL_APIENTRY
+#define GL_APIENTRY KHRONOS_APIENTRY
+#endif
+
+/* Data types */
+
+@passthru
+
+/* Enums */
+
+@enums
+
+/* Function prototypes */
+@for cat,funcs in functions:
+
+/* GL_@cat */
+#ifndef GL_@cat
+#define GL_@cat 1
+    @for f in funcs:
+GL_APICALL @f.returntype GL_APIENTRY GLES2@f.name\
+(@f.param_type_list_string());
+#define gl@f.name GLES2@f.name
+    @end
+#endif
+@end
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

src/MagnumExternal/OpenGL/GLES2/README.md

@@ -0,0 +1,22 @@
+OpenGL header and extension loader is generated using flextGL, get it at
+[](https://github.com/ginkgo/flextGL).
+
+See [](extensions.txt) for requested version and a list of non-core extensions.
+Call `flextGLgen.py` in this directory with the following arguments to generate
+files for generic GLES2 implementations:
+
+    .../flextGLgen.py -D . -t . extensions.txt
+
+It will generate `flextGL.h` and `flextGL.cpp` files.
+
+NaCl and Emscripten don't have the ability to manually load extension pointers,
+thus they have only header files:
+
+    .../flextGLgen.py -D . -t NaCl/ extensions.txt
+    .../flextGLgen.py -D . -t Emscripten/ extensions.txt
+
+This will generate stripped-down `flextGLNaCl.h` and `flextGLEmscripten.h`
+files.
+
+As usual, be sure to check the diff for suspicious changes and
+whitespace-at-EOL (although there shouldn't be any).

src/MagnumExternal/OpenGL/GLES2/extensions.txt

@@ -0,0 +1,71 @@
+# The following output is taken from `magnum-info` with removed `GL_` prefixes.
+
+version 2.0 es
+
+extension ANGLE_framebuffer_blit                optional
+extension ANGLE_framebuffer_multisample         optional
+extension ANGLE_instanced_arrays                optional
+extension ANGLE_depth_texture                   optional
+extension APPLE_framebuffer_multisample         optional
+extension APPLE_texture_max_level               optional
+extension ARM_rgba8                             optional
+extension EXT_texture_type_2_10_10_10_REV       optional
+extension EXT_discard_framebuffer               optional
+extension EXT_blend_minmax                      optional
+extension EXT_shader_texture_lod                optional
+extension EXT_occlusion_query_boolean           optional
+extension EXT_shadow_samplers                   optional
+extension EXT_texture_rg                        optional
+extension EXT_texture_storage                   optional
+extension EXT_map_buffer_range                  optional
+extension EXT_instanced_arrays                  optional
+extension EXT_draw_instanced                    optional
+extension NV_draw_buffers                       optional
+extension NV_fbo_color_attachments              optional
+extension NV_read_buffer                        optional
+extension NV_draw_instanced                     optional
+extension NV_framebuffer_blit                   optional
+extension NV_framebuffer_multisample            optional
+extension NV_instanced_arrays                   optional
+extension NV_shadow_samplers_array              optional
+extension NV_shadow_samplers_cube               optional
+extension OES_depth24                           optional
+extension OES_element_index_uint                optional
+extension OES_rgb8_rgba8                        optional
+extension OES_texture_3D                        optional
+extension OES_texture_half_float_linear         optional
+extension OES_texture_float_linear              optional
+extension OES_texture_half_float                optional
+extension OES_texture_float                     optional
+extension OES_vertex_half_float                 optional
+extension OES_packed_depth_stencil              optional
+extension OES_depth_texture                     optional
+extension OES_standard_derivatives              optional
+extension OES_vertex_array_object               optional
+extension OES_required_internalformat           optional
+extension OES_surfaceless_context               optional
+
+extension APPLE_texture_format_BGRA8888         optional
+extension CHROMIUM_map_sub                      optional
+extension EXT_texture_filter_anisotropic        optional
+extension EXT_texture_format_BGRA8888           optional
+extension EXT_read_format_bgra                  optional
+extension EXT_multi_draw_arrays                 optional
+extension EXT_debug_label                       optional
+extension EXT_debug_marker                      optional
+extension EXT_disjoint_timer_query              optional
+extension EXT_texture_sRGB_decode               optional
+extension EXT_separate_shader_objects           optional
+extension EXT_sRGB                              optional
+extension EXT_multisampled_render_to_texture    optional
+extension EXT_robustness                        optional
+extension KHR_debug                             optional
+extension NV_read_buffer_front                  optional
+extension NV_read_depth                         optional
+extension NV_read_stencil                       optional
+extension NV_read_depth_stencil                 optional
+extension NV_texture_border_clamp               optional
+extension OES_depth32                           optional
+extension OES_mapbuffer                         optional
+extension OES_stencil1                          optional
+extension OES_stencil4                          optional

src/MagnumExternal/OpenGL/GLES2/flextGL.cpp

@@ -0,0 +1,196 @@
+#include "flextGL.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* GL_ANGLE_framebuffer_blit */
+FLEXTGL_EXPORT void(APIENTRY *flextglBlitFramebufferANGLE)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum) = nullptr;
+
+/* GL_ANGLE_framebuffer_multisample */
+FLEXTGL_EXPORT void(APIENTRY *flextglRenderbufferStorageMultisampleANGLE)(GLenum, GLsizei, GLenum, GLsizei, GLsizei) = nullptr;
+
+/* GL_ANGLE_instanced_arrays */
+FLEXTGL_EXPORT void(APIENTRY *flextglDrawArraysInstancedANGLE)(GLenum, GLint, GLsizei, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDrawElementsInstancedANGLE)(GLenum, GLsizei, GLenum, const void *, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglVertexAttribDivisorANGLE)(GLuint, GLuint) = nullptr;
+
+/* GL_APPLE_framebuffer_multisample */
+FLEXTGL_EXPORT void(APIENTRY *flextglRenderbufferStorageMultisampleAPPLE)(GLenum, GLsizei, GLenum, GLsizei, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglResolveMultisampleFramebufferAPPLE)(void) = nullptr;
+
+/* GL_EXT_discard_framebuffer */
+FLEXTGL_EXPORT void(APIENTRY *flextglDiscardFramebufferEXT)(GLenum, GLsizei, const GLenum *) = nullptr;
+
+/* GL_EXT_blend_minmax */
+FLEXTGL_EXPORT void(APIENTRY *flextglBlendEquationEXT)(GLenum) = nullptr;
+
+/* GL_EXT_occlusion_query_boolean */
+FLEXTGL_EXPORT void(APIENTRY *flextglGenQueriesEXT)(GLsizei, GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDeleteQueriesEXT)(GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT GLboolean(APIENTRY *flextglIsQueryEXT)(GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglBeginQueryEXT)(GLenum, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglEndQueryEXT)(GLenum) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetQueryivEXT)(GLenum, GLenum, GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetQueryObjectuivEXT)(GLuint, GLenum, GLuint *) = nullptr;
+
+/* GL_EXT_texture_storage */
+FLEXTGL_EXPORT void(APIENTRY *flextglTexStorage1DEXT)(GLenum, GLsizei, GLenum, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglTexStorage2DEXT)(GLenum, GLsizei, GLenum, GLsizei, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglTexStorage3DEXT)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglTextureStorage1DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglTextureStorage2DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglTextureStorage3DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei) = nullptr;
+
+/* GL_EXT_map_buffer_range */
+FLEXTGL_EXPORT void *(APIENTRY *flextglMapBufferRangeEXT)(GLenum, GLintptr, GLsizeiptr, GLbitfield) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglFlushMappedBufferRangeEXT)(GLenum, GLintptr, GLsizeiptr) = nullptr;
+
+/* GL_EXT_instanced_arrays */
+FLEXTGL_EXPORT void(APIENTRY *flextglDrawArraysInstancedEXT)(GLenum, GLint, GLsizei, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDrawElementsInstancedEXT)(GLenum, GLsizei, GLenum, const void *, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglVertexAttribDivisorEXT)(GLuint, GLuint) = nullptr;
+
+/* GL_NV_draw_buffers */
+FLEXTGL_EXPORT void(APIENTRY *flextglDrawBuffersNV)(GLsizei, const GLenum *) = nullptr;
+
+/* GL_NV_read_buffer */
+FLEXTGL_EXPORT void(APIENTRY *flextglReadBufferNV)(GLenum) = nullptr;
+
+/* GL_NV_draw_instanced */
+FLEXTGL_EXPORT void(APIENTRY *flextglDrawArraysInstancedNV)(GLenum, GLint, GLsizei, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDrawElementsInstancedNV)(GLenum, GLsizei, GLenum, const void *, GLsizei) = nullptr;
+
+/* GL_NV_framebuffer_blit */
+FLEXTGL_EXPORT void(APIENTRY *flextglBlitFramebufferNV)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum) = nullptr;
+
+/* GL_NV_framebuffer_multisample */
+FLEXTGL_EXPORT void(APIENTRY *flextglRenderbufferStorageMultisampleNV)(GLenum, GLsizei, GLenum, GLsizei, GLsizei) = nullptr;
+
+/* GL_NV_instanced_arrays */
+FLEXTGL_EXPORT void(APIENTRY *flextglVertexAttribDivisorNV)(GLuint, GLuint) = nullptr;
+
+/* GL_OES_texture_3D */
+FLEXTGL_EXPORT void(APIENTRY *flextglTexImage3DOES)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const void *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglTexSubImage3DOES)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const void *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglCopyTexSubImage3DOES)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglCompressedTexImage3DOES)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const void *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglCompressedTexSubImage3DOES)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const void *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglFramebufferTexture3DOES)(GLenum, GLenum, GLenum, GLuint, GLint, GLint) = nullptr;
+
+/* GL_OES_vertex_array_object */
+FLEXTGL_EXPORT void(APIENTRY *flextglBindVertexArrayOES)(GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDeleteVertexArraysOES)(GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGenVertexArraysOES)(GLsizei, GLuint *) = nullptr;
+FLEXTGL_EXPORT GLboolean(APIENTRY *flextglIsVertexArrayOES)(GLuint) = nullptr;
+
+/* GL_EXT_multi_draw_arrays */
+FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawArraysEXT)(GLenum, const GLint *, const GLsizei *, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawElementsEXT)(GLenum, const GLsizei *, GLenum, const void *const*, GLsizei) = nullptr;
+
+/* GL_EXT_debug_label */
+FLEXTGL_EXPORT void(APIENTRY *flextglLabelObjectEXT)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabelEXT)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *) = nullptr;
+
+/* GL_EXT_debug_marker */
+FLEXTGL_EXPORT void(APIENTRY *flextglInsertEventMarkerEXT)(GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglPushGroupMarkerEXT)(GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglPopGroupMarkerEXT)(void) = nullptr;
+
+/* GL_EXT_disjoint_timer_query */
+FLEXTGL_EXPORT void(APIENTRY *flextglQueryCounterEXT)(GLuint, GLenum) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetQueryObjectivEXT)(GLuint, GLenum, GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetQueryObjecti64vEXT)(GLuint, GLenum, GLint64 *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetQueryObjectui64vEXT)(GLuint, GLenum, GLuint64 *) = nullptr;
+
+/* GL_EXT_separate_shader_objects */
+FLEXTGL_EXPORT void(APIENTRY *flextglUseShaderProgramEXT)(GLenum, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglActiveProgramEXT)(GLuint) = nullptr;
+FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateShaderProgramEXT)(GLenum, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglActiveShaderProgramEXT)(GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglBindProgramPipelineEXT)(GLuint) = 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;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetProgramPipelineInfoLogEXT)(GLuint, GLsizei, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetProgramPipelineivEXT)(GLuint, GLenum, GLint *) = nullptr;
+FLEXTGL_EXPORT GLboolean(APIENTRY *flextglIsProgramPipelineEXT)(GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramParameteriEXT)(GLuint, GLenum, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1fEXT)(GLuint, GLint, GLfloat) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1fvEXT)(GLuint, GLint, GLsizei, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1iEXT)(GLuint, GLint, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1ivEXT)(GLuint, GLint, GLsizei, const GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2fEXT)(GLuint, GLint, GLfloat, GLfloat) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2fvEXT)(GLuint, GLint, GLsizei, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2iEXT)(GLuint, GLint, GLint, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2ivEXT)(GLuint, GLint, GLsizei, const GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3fEXT)(GLuint, GLint, GLfloat, GLfloat, GLfloat) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3fvEXT)(GLuint, GLint, GLsizei, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3iEXT)(GLuint, GLint, GLint, GLint, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3ivEXT)(GLuint, GLint, GLsizei, const GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4fEXT)(GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4fvEXT)(GLuint, GLint, GLsizei, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4iEXT)(GLuint, GLint, GLint, GLint, GLint, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4ivEXT)(GLuint, GLint, GLsizei, const GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix2fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix3fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglUseProgramStagesEXT)(GLuint, GLbitfield, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglValidateProgramPipelineEXT)(GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1uiEXT)(GLuint, GLint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2uiEXT)(GLuint, GLint, GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3uiEXT)(GLuint, GLint, GLuint, GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4uiEXT)(GLuint, GLint, GLuint, GLuint, GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1uivEXT)(GLuint, GLint, GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2uivEXT)(GLuint, GLint, GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3uivEXT)(GLuint, GLint, GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4uivEXT)(GLuint, GLint, GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix2x3fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix3x2fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix2x4fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x2fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix3x4fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x3fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+
+/* GL_EXT_multisampled_render_to_texture */
+FLEXTGL_EXPORT void(APIENTRY *flextglRenderbufferStorageMultisampleEXT)(GLenum, GLsizei, GLenum, GLsizei, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglFramebufferTexture2DMultisampleEXT)(GLenum, GLenum, GLenum, GLuint, GLint, GLsizei) = nullptr;
+
+/* GL_EXT_robustness */
+FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusEXT)(void) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsEXT)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformfvEXT)(GLuint, GLint, GLsizei, GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformivEXT)(GLuint, GLint, GLsizei, GLint *) = nullptr;
+
+/* GL_KHR_debug */
+FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageControl)(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 *flextglDebugMessageCallback)(GLDEBUGPROC, const void *) = nullptr;
+FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetDebugMessageLog)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroup)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroup)(void) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabel)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabel)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabel)(const void *, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectPtrLabel)(const void *, GLsizei, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetPointerv)(GLenum, void **) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageControlKHR)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageInsertKHR)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageCallbackKHR)(GLDEBUGPROCKHR, const void *) = nullptr;
+FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetDebugMessageLogKHR)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroupKHR)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroupKHR)(void) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabelKHR)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabelKHR)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabelKHR)(const void *, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectPtrLabelKHR)(const void *, GLsizei, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetPointervKHR)(GLenum, void **) = nullptr;
+
+/* GL_OES_mapbuffer */
+FLEXTGL_EXPORT void *(APIENTRY *flextglMapBufferOES)(GLenum, GLenum) = nullptr;
+FLEXTGL_EXPORT GLboolean(APIENTRY *flextglUnmapBufferOES)(GLenum) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetBufferPointervOES)(GLenum, GLenum, void **) = nullptr;
+
+#ifdef __cplusplus
+}
+#endif

src/MagnumExternal/OpenGL/GLES2/flextGL.cpp.template

@@ -0,0 +1,20 @@
+@require(passthru, functions, enums, options, version, extensions)
+#include "flextGL.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+@for category,funcs in functions:
+@if len(funcs) > 0 and category not in ['ES_VERSION_2_0']:
+
+/* GL_@category */
+@for f in funcs:
+FLEXTGL_EXPORT @f.returntype\
+(APIENTRY *flextgl@f.name)(@f.param_type_list_string()) = nullptr;
+@end
+@end
+@end
+
+#ifdef __cplusplus
+}
+#endif

src/MagnumExternal/OpenGL/GLES2/flextGL.h.template

@@ -0,0 +1,86 @@
+@require(passthru, functions, enums, options, version, extensions)
+#ifndef _flextgl_h_
+#define _flextgl_h_
+
+/* Defensive include guards */
+
+#if defined(__gl_h_) || defined(__gl2_h_)
+#error Attempt to include auto-generated header after including gl2.h
+#endif
+#if defined(__gl2ext_h_)
+#error Attempt to include auto-generated header after including gl2ext.h
+#endif
+#if defined(__gl2platform_h_)
+#error Attempt to include auto-generated header after including gl2platform.h
+#endif
+
+#define __gl_h_
+#define __gl2_h_
+#define __gl2ext_h_
+#define __gl2platform_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void flextGLInit();
+
+/* Function declaration macros */
+
+#ifdef _WIN32
+    #ifdef FlextGL_EXPORTS
+        #define FLEXTGL_EXPORT __declspec(dllexport)
+    #else
+        #define FLEXTGL_EXPORT __declspec(dllimport)
+    #endif
+#else
+    #define FLEXTGL_EXPORT __attribute__ ((visibility ("default")))
+#endif
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#ifndef WINAPI
+#define WINAPI __stdcall
+#endif
+#define APIENTRY WINAPI
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/* Data types */
+
+@passthru
+
+/* Enums */
+
+@enums
+
+/* Function prototypes */
+@for cat,funcs in functions:
+
+/* GL_@cat */
+
+    @if cat in ['ES_VERSION_2_0']:
+        @for f in funcs:
+GLAPI FLEXTGL_EXPORT @f.returntype APIENTRY gl@f.name\
+(@f.param_type_list_string());
+        @end
+    @else:
+        @for f in funcs:
+GLAPI FLEXTGL_EXPORT @f.returntype\
+(APIENTRY *flextgl@f.name)(@f.param_type_list_string());
+#define gl@f.name flextgl@f.name
+        @end
+    @end
+@end
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp

@@ -0,0 +1,273 @@
+#include "flextGL.h"
+
+#include <cstdio>
+#include <cstdlib>
+
+#include "Magnum/Platform/Implementation/OpenGLFunctionLoader.h"
+
+void flextGLInit() {
+    Magnum::Platform::Implementation::OpenGLFunctionLoader loader;
+
+    /* GL_ANGLE_framebuffer_blit */
+    flextglBlitFramebufferANGLE = reinterpret_cast<void(APIENTRY*)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum)>(loader.load("glBlitFramebufferANGLE"));
+
+    /* GL_ANGLE_framebuffer_multisample */
+    flextglRenderbufferStorageMultisampleANGLE = reinterpret_cast<void(APIENTRY*)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)>(loader.load("glRenderbufferStorageMultisampleANGLE"));
+
+    /* GL_ANGLE_instanced_arrays */
+    flextglDrawArraysInstancedANGLE = reinterpret_cast<void(APIENTRY*)(GLenum, GLint, GLsizei, GLsizei)>(loader.load("glDrawArraysInstancedANGLE"));
+    flextglDrawElementsInstancedANGLE = reinterpret_cast<void(APIENTRY*)(GLenum, GLsizei, GLenum, const void *, GLsizei)>(loader.load("glDrawElementsInstancedANGLE"));
+    flextglVertexAttribDivisorANGLE = reinterpret_cast<void(APIENTRY*)(GLuint, GLuint)>(loader.load("glVertexAttribDivisorANGLE"));
+
+    /* GL_ANGLE_depth_texture */
+
+    /* GL_APPLE_framebuffer_multisample */
+    flextglRenderbufferStorageMultisampleAPPLE = reinterpret_cast<void(APIENTRY*)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)>(loader.load("glRenderbufferStorageMultisampleAPPLE"));
+    flextglResolveMultisampleFramebufferAPPLE = reinterpret_cast<void(APIENTRY*)(void)>(loader.load("glResolveMultisampleFramebufferAPPLE"));
+
+    /* GL_APPLE_texture_max_level */
+
+    /* GL_ARM_rgba8 */
+
+    /* GL_EXT_texture_type_2_10_10_10_REV */
+
+    /* GL_EXT_discard_framebuffer */
+    flextglDiscardFramebufferEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLsizei, const GLenum *)>(loader.load("glDiscardFramebufferEXT"));
+
+    /* GL_EXT_blend_minmax */
+    flextglBlendEquationEXT = reinterpret_cast<void(APIENTRY*)(GLenum)>(loader.load("glBlendEquationEXT"));
+
+    /* GL_EXT_shader_texture_lod */
+
+    /* GL_EXT_occlusion_query_boolean */
+    flextglGenQueriesEXT = reinterpret_cast<void(APIENTRY*)(GLsizei, GLuint *)>(loader.load("glGenQueriesEXT"));
+    flextglDeleteQueriesEXT = reinterpret_cast<void(APIENTRY*)(GLsizei, const GLuint *)>(loader.load("glDeleteQueriesEXT"));
+    flextglIsQueryEXT = reinterpret_cast<GLboolean(APIENTRY*)(GLuint)>(loader.load("glIsQueryEXT"));
+    flextglBeginQueryEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLuint)>(loader.load("glBeginQueryEXT"));
+    flextglEndQueryEXT = reinterpret_cast<void(APIENTRY*)(GLenum)>(loader.load("glEndQueryEXT"));
+    flextglGetQueryivEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLenum, GLint *)>(loader.load("glGetQueryivEXT"));
+    flextglGetQueryObjectuivEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLuint *)>(loader.load("glGetQueryObjectuivEXT"));
+
+    /* GL_EXT_shadow_samplers */
+
+    /* GL_EXT_texture_rg */
+
+    /* GL_EXT_texture_storage */
+    flextglTexStorage1DEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLsizei, GLenum, GLsizei)>(loader.load("glTexStorage1DEXT"));
+    flextglTexStorage2DEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)>(loader.load("glTexStorage2DEXT"));
+    flextglTexStorage3DEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)>(loader.load("glTexStorage3DEXT"));
+    flextglTextureStorage1DEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLsizei, GLenum, GLsizei)>(loader.load("glTextureStorage1DEXT"));
+    flextglTextureStorage2DEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei)>(loader.load("glTextureStorage2DEXT"));
+    flextglTextureStorage3DEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)>(loader.load("glTextureStorage3DEXT"));
+
+    /* GL_EXT_map_buffer_range */
+    flextglMapBufferRangeEXT = reinterpret_cast<void *(APIENTRY*)(GLenum, GLintptr, GLsizeiptr, GLbitfield)>(loader.load("glMapBufferRangeEXT"));
+    flextglFlushMappedBufferRangeEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLintptr, GLsizeiptr)>(loader.load("glFlushMappedBufferRangeEXT"));
+
+    /* GL_EXT_instanced_arrays */
+    flextglDrawArraysInstancedEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLint, GLsizei, GLsizei)>(loader.load("glDrawArraysInstancedEXT"));
+    flextglDrawElementsInstancedEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLsizei, GLenum, const void *, GLsizei)>(loader.load("glDrawElementsInstancedEXT"));
+    flextglVertexAttribDivisorEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLuint)>(loader.load("glVertexAttribDivisorEXT"));
+
+    /* GL_EXT_draw_instanced */
+
+    /* GL_NV_draw_buffers */
+    flextglDrawBuffersNV = reinterpret_cast<void(APIENTRY*)(GLsizei, const GLenum *)>(loader.load("glDrawBuffersNV"));
+
+    /* GL_NV_fbo_color_attachments */
+
+    /* GL_NV_read_buffer */
+    flextglReadBufferNV = reinterpret_cast<void(APIENTRY*)(GLenum)>(loader.load("glReadBufferNV"));
+
+    /* GL_NV_draw_instanced */
+    flextglDrawArraysInstancedNV = reinterpret_cast<void(APIENTRY*)(GLenum, GLint, GLsizei, GLsizei)>(loader.load("glDrawArraysInstancedNV"));
+    flextglDrawElementsInstancedNV = reinterpret_cast<void(APIENTRY*)(GLenum, GLsizei, GLenum, const void *, GLsizei)>(loader.load("glDrawElementsInstancedNV"));
+
+    /* GL_NV_framebuffer_blit */
+    flextglBlitFramebufferNV = reinterpret_cast<void(APIENTRY*)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum)>(loader.load("glBlitFramebufferNV"));
+
+    /* GL_NV_framebuffer_multisample */
+    flextglRenderbufferStorageMultisampleNV = reinterpret_cast<void(APIENTRY*)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)>(loader.load("glRenderbufferStorageMultisampleNV"));
+
+    /* GL_NV_instanced_arrays */
+    flextglVertexAttribDivisorNV = reinterpret_cast<void(APIENTRY*)(GLuint, GLuint)>(loader.load("glVertexAttribDivisorNV"));
+
+    /* GL_NV_shadow_samplers_array */
+
+    /* GL_NV_shadow_samplers_cube */
+
+    /* GL_OES_depth24 */
+
+    /* GL_OES_element_index_uint */
+
+    /* GL_OES_rgb8_rgba8 */
+
+    /* GL_OES_texture_3D */
+    flextglTexImage3DOES = reinterpret_cast<void(APIENTRY*)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const void *)>(loader.load("glTexImage3DOES"));
+    flextglTexSubImage3DOES = reinterpret_cast<void(APIENTRY*)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const void *)>(loader.load("glTexSubImage3DOES"));
+    flextglCopyTexSubImage3DOES = reinterpret_cast<void(APIENTRY*)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)>(loader.load("glCopyTexSubImage3DOES"));
+    flextglCompressedTexImage3DOES = reinterpret_cast<void(APIENTRY*)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const void *)>(loader.load("glCompressedTexImage3DOES"));
+    flextglCompressedTexSubImage3DOES = reinterpret_cast<void(APIENTRY*)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const void *)>(loader.load("glCompressedTexSubImage3DOES"));
+    flextglFramebufferTexture3DOES = reinterpret_cast<void(APIENTRY*)(GLenum, GLenum, GLenum, GLuint, GLint, GLint)>(loader.load("glFramebufferTexture3DOES"));
+
+    /* GL_OES_texture_half_float_linear */
+
+    /* GL_OES_texture_float_linear */
+
+    /* GL_OES_texture_half_float */
+
+    /* GL_OES_texture_float */
+
+    /* GL_OES_vertex_half_float */
+
+    /* GL_OES_packed_depth_stencil */
+
+    /* GL_OES_depth_texture */
+
+    /* GL_OES_standard_derivatives */
+
+    /* GL_OES_vertex_array_object */
+    flextglBindVertexArrayOES = reinterpret_cast<void(APIENTRY*)(GLuint)>(loader.load("glBindVertexArrayOES"));
+    flextglDeleteVertexArraysOES = reinterpret_cast<void(APIENTRY*)(GLsizei, const GLuint *)>(loader.load("glDeleteVertexArraysOES"));
+    flextglGenVertexArraysOES = reinterpret_cast<void(APIENTRY*)(GLsizei, GLuint *)>(loader.load("glGenVertexArraysOES"));
+    flextglIsVertexArrayOES = reinterpret_cast<GLboolean(APIENTRY*)(GLuint)>(loader.load("glIsVertexArrayOES"));
+
+    /* GL_OES_required_internalformat */
+
+    /* GL_OES_surfaceless_context */
+
+    /* GL_APPLE_texture_format_BGRA8888 */
+
+    /* GL_EXT_texture_filter_anisotropic */
+
+    /* GL_EXT_texture_format_BGRA8888 */
+
+    /* GL_EXT_read_format_bgra */
+
+    /* GL_EXT_multi_draw_arrays */
+    flextglMultiDrawArraysEXT = reinterpret_cast<void(APIENTRY*)(GLenum, const GLint *, const GLsizei *, GLsizei)>(loader.load("glMultiDrawArraysEXT"));
+    flextglMultiDrawElementsEXT = reinterpret_cast<void(APIENTRY*)(GLenum, const GLsizei *, GLenum, const void *const*, GLsizei)>(loader.load("glMultiDrawElementsEXT"));
+
+    /* GL_EXT_debug_label */
+    flextglLabelObjectEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLuint, GLsizei, const GLchar *)>(loader.load("glLabelObjectEXT"));
+    flextglGetObjectLabelEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *)>(loader.load("glGetObjectLabelEXT"));
+
+    /* GL_EXT_debug_marker */
+    flextglInsertEventMarkerEXT = reinterpret_cast<void(APIENTRY*)(GLsizei, const GLchar *)>(loader.load("glInsertEventMarkerEXT"));
+    flextglPushGroupMarkerEXT = reinterpret_cast<void(APIENTRY*)(GLsizei, const GLchar *)>(loader.load("glPushGroupMarkerEXT"));
+    flextglPopGroupMarkerEXT = reinterpret_cast<void(APIENTRY*)(void)>(loader.load("glPopGroupMarkerEXT"));
+
+    /* GL_EXT_disjoint_timer_query */
+    flextglQueryCounterEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum)>(loader.load("glQueryCounterEXT"));
+    flextglGetQueryObjectivEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLint *)>(loader.load("glGetQueryObjectivEXT"));
+    flextglGetQueryObjecti64vEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLint64 *)>(loader.load("glGetQueryObjecti64vEXT"));
+    flextglGetQueryObjectui64vEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLuint64 *)>(loader.load("glGetQueryObjectui64vEXT"));
+
+    /* GL_EXT_texture_sRGB_decode */
+
+    /* GL_EXT_separate_shader_objects */
+    flextglUseShaderProgramEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLuint)>(loader.load("glUseShaderProgramEXT"));
+    flextglActiveProgramEXT = reinterpret_cast<void(APIENTRY*)(GLuint)>(loader.load("glActiveProgramEXT"));
+    flextglCreateShaderProgramEXT = reinterpret_cast<GLuint(APIENTRY*)(GLenum, const GLchar *)>(loader.load("glCreateShaderProgramEXT"));
+    flextglActiveShaderProgramEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLuint)>(loader.load("glActiveShaderProgramEXT"));
+    flextglBindProgramPipelineEXT = reinterpret_cast<void(APIENTRY*)(GLuint)>(loader.load("glBindProgramPipelineEXT"));
+    flextglCreateShaderProgramvEXT = reinterpret_cast<GLuint(APIENTRY*)(GLenum, GLsizei, const GLchar **)>(loader.load("glCreateShaderProgramvEXT"));
+    flextglDeleteProgramPipelinesEXT = reinterpret_cast<void(APIENTRY*)(GLsizei, const GLuint *)>(loader.load("glDeleteProgramPipelinesEXT"));
+    flextglGenProgramPipelinesEXT = reinterpret_cast<void(APIENTRY*)(GLsizei, GLuint *)>(loader.load("glGenProgramPipelinesEXT"));
+    flextglGetProgramPipelineInfoLogEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLsizei, GLsizei *, GLchar *)>(loader.load("glGetProgramPipelineInfoLogEXT"));
+    flextglGetProgramPipelineivEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLint *)>(loader.load("glGetProgramPipelineivEXT"));
+    flextglIsProgramPipelineEXT = reinterpret_cast<GLboolean(APIENTRY*)(GLuint)>(loader.load("glIsProgramPipelineEXT"));
+    flextglProgramParameteriEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLint)>(loader.load("glProgramParameteriEXT"));
+    flextglProgramUniform1fEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLfloat)>(loader.load("glProgramUniform1fEXT"));
+    flextglProgramUniform1fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, const GLfloat *)>(loader.load("glProgramUniform1fvEXT"));
+    flextglProgramUniform1iEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLint)>(loader.load("glProgramUniform1iEXT"));
+    flextglProgramUniform1ivEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, const GLint *)>(loader.load("glProgramUniform1ivEXT"));
+    flextglProgramUniform2fEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLfloat, GLfloat)>(loader.load("glProgramUniform2fEXT"));
+    flextglProgramUniform2fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, const GLfloat *)>(loader.load("glProgramUniform2fvEXT"));
+    flextglProgramUniform2iEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLint, GLint)>(loader.load("glProgramUniform2iEXT"));
+    flextglProgramUniform2ivEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, const GLint *)>(loader.load("glProgramUniform2ivEXT"));
+    flextglProgramUniform3fEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLfloat, GLfloat, GLfloat)>(loader.load("glProgramUniform3fEXT"));
+    flextglProgramUniform3fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, const GLfloat *)>(loader.load("glProgramUniform3fvEXT"));
+    flextglProgramUniform3iEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLint, GLint, GLint)>(loader.load("glProgramUniform3iEXT"));
+    flextglProgramUniform3ivEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, const GLint *)>(loader.load("glProgramUniform3ivEXT"));
+    flextglProgramUniform4fEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat)>(loader.load("glProgramUniform4fEXT"));
+    flextglProgramUniform4fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, const GLfloat *)>(loader.load("glProgramUniform4fvEXT"));
+    flextglProgramUniform4iEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLint, GLint, GLint, GLint)>(loader.load("glProgramUniform4iEXT"));
+    flextglProgramUniform4ivEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, const GLint *)>(loader.load("glProgramUniform4ivEXT"));
+    flextglProgramUniformMatrix2fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)>(loader.load("glProgramUniformMatrix2fvEXT"));
+    flextglProgramUniformMatrix3fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)>(loader.load("glProgramUniformMatrix3fvEXT"));
+    flextglProgramUniformMatrix4fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)>(loader.load("glProgramUniformMatrix4fvEXT"));
+    flextglUseProgramStagesEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLbitfield, GLuint)>(loader.load("glUseProgramStagesEXT"));
+    flextglValidateProgramPipelineEXT = reinterpret_cast<void(APIENTRY*)(GLuint)>(loader.load("glValidateProgramPipelineEXT"));
+    flextglProgramUniform1uiEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLuint)>(loader.load("glProgramUniform1uiEXT"));
+    flextglProgramUniform2uiEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLuint, GLuint)>(loader.load("glProgramUniform2uiEXT"));
+    flextglProgramUniform3uiEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLuint, GLuint, GLuint)>(loader.load("glProgramUniform3uiEXT"));
+    flextglProgramUniform4uiEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLuint, GLuint, GLuint, GLuint)>(loader.load("glProgramUniform4uiEXT"));
+    flextglProgramUniform1uivEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, const GLuint *)>(loader.load("glProgramUniform1uivEXT"));
+    flextglProgramUniform2uivEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, const GLuint *)>(loader.load("glProgramUniform2uivEXT"));
+    flextglProgramUniform3uivEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, const GLuint *)>(loader.load("glProgramUniform3uivEXT"));
+    flextglProgramUniform4uivEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, const GLuint *)>(loader.load("glProgramUniform4uivEXT"));
+    flextglProgramUniformMatrix2x3fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)>(loader.load("glProgramUniformMatrix2x3fvEXT"));
+    flextglProgramUniformMatrix3x2fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)>(loader.load("glProgramUniformMatrix3x2fvEXT"));
+    flextglProgramUniformMatrix2x4fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)>(loader.load("glProgramUniformMatrix2x4fvEXT"));
+    flextglProgramUniformMatrix4x2fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)>(loader.load("glProgramUniformMatrix4x2fvEXT"));
+    flextglProgramUniformMatrix3x4fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)>(loader.load("glProgramUniformMatrix3x4fvEXT"));
+    flextglProgramUniformMatrix4x3fvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)>(loader.load("glProgramUniformMatrix4x3fvEXT"));
+
+    /* GL_EXT_sRGB */
+
+    /* GL_EXT_multisampled_render_to_texture */
+    flextglRenderbufferStorageMultisampleEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)>(loader.load("glRenderbufferStorageMultisampleEXT"));
+    flextglFramebufferTexture2DMultisampleEXT = reinterpret_cast<void(APIENTRY*)(GLenum, GLenum, GLenum, GLuint, GLint, GLsizei)>(loader.load("glFramebufferTexture2DMultisampleEXT"));
+
+    /* GL_EXT_robustness */
+    flextglGetGraphicsResetStatusEXT = reinterpret_cast<GLenum(APIENTRY*)(void)>(loader.load("glGetGraphicsResetStatusEXT"));
+    flextglReadnPixelsEXT = reinterpret_cast<void(APIENTRY*)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *)>(loader.load("glReadnPixelsEXT"));
+    flextglGetnUniformfvEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, GLfloat *)>(loader.load("glGetnUniformfvEXT"));
+    flextglGetnUniformivEXT = reinterpret_cast<void(APIENTRY*)(GLuint, GLint, GLsizei, GLint *)>(loader.load("glGetnUniformivEXT"));
+
+    /* GL_KHR_debug */
+    flextglDebugMessageControl = reinterpret_cast<void(APIENTRY*)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean)>(loader.load("glDebugMessageControl"));
+    flextglDebugMessageInsert = reinterpret_cast<void(APIENTRY*)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *)>(loader.load("glDebugMessageInsert"));
+    flextglDebugMessageCallback = reinterpret_cast<void(APIENTRY*)(GLDEBUGPROC, const void *)>(loader.load("glDebugMessageCallback"));
+    flextglGetDebugMessageLog = reinterpret_cast<GLuint(APIENTRY*)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *)>(loader.load("glGetDebugMessageLog"));
+    flextglPushDebugGroup = reinterpret_cast<void(APIENTRY*)(GLenum, GLuint, GLsizei, const GLchar *)>(loader.load("glPushDebugGroup"));
+    flextglPopDebugGroup = reinterpret_cast<void(APIENTRY*)(void)>(loader.load("glPopDebugGroup"));
+    flextglObjectLabel = reinterpret_cast<void(APIENTRY*)(GLenum, GLuint, GLsizei, const GLchar *)>(loader.load("glObjectLabel"));
+    flextglGetObjectLabel = reinterpret_cast<void(APIENTRY*)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *)>(loader.load("glGetObjectLabel"));
+    flextglObjectPtrLabel = reinterpret_cast<void(APIENTRY*)(const void *, GLsizei, const GLchar *)>(loader.load("glObjectPtrLabel"));
+    flextglGetObjectPtrLabel = reinterpret_cast<void(APIENTRY*)(const void *, GLsizei, GLsizei *, GLchar *)>(loader.load("glGetObjectPtrLabel"));
+    flextglGetPointerv = reinterpret_cast<void(APIENTRY*)(GLenum, void **)>(loader.load("glGetPointerv"));
+    flextglDebugMessageControlKHR = reinterpret_cast<void(APIENTRY*)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean)>(loader.load("glDebugMessageControlKHR"));
+    flextglDebugMessageInsertKHR = reinterpret_cast<void(APIENTRY*)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *)>(loader.load("glDebugMessageInsertKHR"));
+    flextglDebugMessageCallbackKHR = reinterpret_cast<void(APIENTRY*)(GLDEBUGPROCKHR, const void *)>(loader.load("glDebugMessageCallbackKHR"));
+    flextglGetDebugMessageLogKHR = reinterpret_cast<GLuint(APIENTRY*)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *)>(loader.load("glGetDebugMessageLogKHR"));
+    flextglPushDebugGroupKHR = reinterpret_cast<void(APIENTRY*)(GLenum, GLuint, GLsizei, const GLchar *)>(loader.load("glPushDebugGroupKHR"));
+    flextglPopDebugGroupKHR = reinterpret_cast<void(APIENTRY*)(void)>(loader.load("glPopDebugGroupKHR"));
+    flextglObjectLabelKHR = reinterpret_cast<void(APIENTRY*)(GLenum, GLuint, GLsizei, const GLchar *)>(loader.load("glObjectLabelKHR"));
+    flextglGetObjectLabelKHR = reinterpret_cast<void(APIENTRY*)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *)>(loader.load("glGetObjectLabelKHR"));
+    flextglObjectPtrLabelKHR = reinterpret_cast<void(APIENTRY*)(const void *, GLsizei, const GLchar *)>(loader.load("glObjectPtrLabelKHR"));
+    flextglGetObjectPtrLabelKHR = reinterpret_cast<void(APIENTRY*)(const void *, GLsizei, GLsizei *, GLchar *)>(loader.load("glGetObjectPtrLabelKHR"));
+    flextglGetPointervKHR = reinterpret_cast<void(APIENTRY*)(GLenum, void **)>(loader.load("glGetPointervKHR"));
+
+    /* GL_NV_read_buffer_front */
+
+    /* GL_NV_read_depth */
+
+    /* GL_NV_read_stencil */
+
+    /* GL_NV_read_depth_stencil */
+
+    /* GL_NV_texture_border_clamp */
+
+    /* GL_OES_depth32 */
+
+    /* GL_OES_mapbuffer */
+    flextglMapBufferOES = reinterpret_cast<void *(APIENTRY*)(GLenum, GLenum)>(loader.load("glMapBufferOES"));
+    flextglUnmapBufferOES = reinterpret_cast<GLboolean(APIENTRY*)(GLenum)>(loader.load("glUnmapBufferOES"));
+    flextglGetBufferPointervOES = reinterpret_cast<void(APIENTRY*)(GLenum, GLenum, void **)>(loader.load("glGetBufferPointervOES"));
+
+    /* GL_OES_stencil1 */
+
+    /* GL_OES_stencil4 */
+}

src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp.template

@@ -0,0 +1,21 @@
+@require(passthru, functions, enums, options, version, extensions)
+#include "flextGL.h"
+
+#include <cstdio>
+#include <cstdlib>
+
+#include "Magnum/Platform/Implementation/OpenGLFunctionLoader.h"
+
+void flextGLInit() {
+    Magnum::Platform::Implementation::OpenGLFunctionLoader loader;
+    @for category,funcs in functions:
+    @if category not in ['ES_VERSION_2_0']:
+
+    /* GL_@category */
+    @for f in funcs:
+    flextgl@f.name = reinterpret_cast<@f.returntype\
+(APIENTRY*)(@f.param_type_list_string())>(loader.load("gl@f.name"));
+    @end
+    @end
+    @end
+}

src/MagnumExternal/OpenGL/GLES2/gl2.h

@@ -1,523 +0,0 @@
-#ifndef __gl2_h_
-#define __gl2_h_ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2013 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-/*
-** This header is generated from the Khronos OpenGL / OpenGL ES XML
-** API Registry. The current version of the Registry, generator scripts
-** used to make the header, and the header can be found at
-**   http://www.opengl.org/registry/
-**
-** Khronos $Revision$ on $Date$
-*/
-
-#include <GLES2/gl2platform.h>
-
-/* Generated C header for:
- * API: gles2
- * Profile: common
- * Versions considered: 2\.[0-9]
- * Versions emitted: .*
- * Default extensions included: None
- * Additional extensions included: _nomatch_^
- * Extensions removed: _nomatch_^
- */
-
-#ifndef GL_ES_VERSION_2_0
-#define GL_ES_VERSION_2_0 1
-#include <KHR/khrplatform.h>
-typedef khronos_int8_t GLbyte;
-typedef khronos_float_t GLclampf;
-typedef khronos_int32_t GLfixed;
-typedef short GLshort;
-typedef unsigned short GLushort;
-typedef void GLvoid;
-typedef struct __GLsync *GLsync;
-typedef khronos_int64_t GLint64;
-typedef khronos_uint64_t GLuint64;
-typedef unsigned int GLenum;
-typedef unsigned int GLuint;
-typedef char GLchar;
-typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
-typedef unsigned int GLbitfield;
-typedef int GLint;
-typedef unsigned char GLboolean;
-typedef int GLsizei;
-typedef khronos_uint8_t GLubyte;
-#define GL_DEPTH_BUFFER_BIT               0x00000100
-#define GL_STENCIL_BUFFER_BIT             0x00000400
-#define GL_COLOR_BUFFER_BIT               0x00004000
-#define GL_FALSE                          0
-#define GL_TRUE                           1
-#define GL_POINTS                         0x0000
-#define GL_LINES                          0x0001
-#define GL_LINE_LOOP                      0x0002
-#define GL_LINE_STRIP                     0x0003
-#define GL_TRIANGLES                      0x0004
-#define GL_TRIANGLE_STRIP                 0x0005
-#define GL_TRIANGLE_FAN                   0x0006
-#define GL_ZERO                           0
-#define GL_ONE                            1
-#define GL_SRC_COLOR                      0x0300
-#define GL_ONE_MINUS_SRC_COLOR            0x0301
-#define GL_SRC_ALPHA                      0x0302
-#define GL_ONE_MINUS_SRC_ALPHA            0x0303
-#define GL_DST_ALPHA                      0x0304
-#define GL_ONE_MINUS_DST_ALPHA            0x0305
-#define GL_DST_COLOR                      0x0306
-#define GL_ONE_MINUS_DST_COLOR            0x0307
-#define GL_SRC_ALPHA_SATURATE             0x0308
-#define GL_FUNC_ADD                       0x8006
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_BLEND_EQUATION_RGB             0x8009
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_FRONT                          0x0404
-#define GL_BACK                           0x0405
-#define GL_FRONT_AND_BACK                 0x0408
-#define GL_TEXTURE_2D                     0x0DE1
-#define GL_CULL_FACE                      0x0B44
-#define GL_BLEND                          0x0BE2
-#define GL_DITHER                         0x0BD0
-#define GL_STENCIL_TEST                   0x0B90
-#define GL_DEPTH_TEST                     0x0B71
-#define GL_SCISSOR_TEST                   0x0C11
-#define GL_POLYGON_OFFSET_FILL            0x8037
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_NO_ERROR                       0
-#define GL_INVALID_ENUM                   0x0500
-#define GL_INVALID_VALUE                  0x0501
-#define GL_INVALID_OPERATION              0x0502
-#define GL_OUT_OF_MEMORY                  0x0505
-#define GL_CW                             0x0900
-#define GL_CCW                            0x0901
-#define GL_LINE_WIDTH                     0x0B21
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#define GL_CULL_FACE_MODE                 0x0B45
-#define GL_FRONT_FACE                     0x0B46
-#define GL_DEPTH_RANGE                    0x0B70
-#define GL_DEPTH_WRITEMASK                0x0B72
-#define GL_DEPTH_CLEAR_VALUE              0x0B73
-#define GL_DEPTH_FUNC                     0x0B74
-#define GL_STENCIL_CLEAR_VALUE            0x0B91
-#define GL_STENCIL_FUNC                   0x0B92
-#define GL_STENCIL_FAIL                   0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
-#define GL_STENCIL_REF                    0x0B97
-#define GL_STENCIL_VALUE_MASK             0x0B93
-#define GL_STENCIL_WRITEMASK              0x0B98
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#define GL_VIEWPORT                       0x0BA2
-#define GL_SCISSOR_BOX                    0x0C10
-#define GL_COLOR_CLEAR_VALUE              0x0C22
-#define GL_COLOR_WRITEMASK                0x0C23
-#define GL_UNPACK_ALIGNMENT               0x0CF5
-#define GL_PACK_ALIGNMENT                 0x0D05
-#define GL_MAX_TEXTURE_SIZE               0x0D33
-#define GL_MAX_VIEWPORT_DIMS              0x0D3A
-#define GL_SUBPIXEL_BITS                  0x0D50
-#define GL_RED_BITS                       0x0D52
-#define GL_GREEN_BITS                     0x0D53
-#define GL_BLUE_BITS                      0x0D54
-#define GL_ALPHA_BITS                     0x0D55
-#define GL_DEPTH_BITS                     0x0D56
-#define GL_STENCIL_BITS                   0x0D57
-#define GL_POLYGON_OFFSET_UNITS           0x2A00
-#define GL_POLYGON_OFFSET_FACTOR          0x8038
-#define GL_TEXTURE_BINDING_2D             0x8069
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_DONT_CARE                      0x1100
-#define GL_FASTEST                        0x1101
-#define GL_NICEST                         0x1102
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-#define GL_BYTE                           0x1400
-#define GL_UNSIGNED_BYTE                  0x1401
-#define GL_SHORT                          0x1402
-#define GL_UNSIGNED_SHORT                 0x1403
-#define GL_INT                            0x1404
-#define GL_UNSIGNED_INT                   0x1405
-#define GL_FLOAT                          0x1406
-#define GL_FIXED                          0x140C
-#define GL_DEPTH_COMPONENT                0x1902
-#define GL_ALPHA                          0x1906
-#define GL_RGB                            0x1907
-#define GL_RGBA                           0x1908
-#define GL_LUMINANCE                      0x1909
-#define GL_LUMINANCE_ALPHA                0x190A
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_MAX_VERTEX_UNIFORM_VECTORS     0x8DFB
-#define GL_MAX_VARYING_VECTORS            0x8DFC
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS   0x8DFD
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_NEVER                          0x0200
-#define GL_LESS                           0x0201
-#define GL_EQUAL                          0x0202
-#define GL_LEQUAL                         0x0203
-#define GL_GREATER                        0x0204
-#define GL_NOTEQUAL                       0x0205
-#define GL_GEQUAL                         0x0206
-#define GL_ALWAYS                         0x0207
-#define GL_KEEP                           0x1E00
-#define GL_REPLACE                        0x1E01
-#define GL_INCR                           0x1E02
-#define GL_DECR                           0x1E03
-#define GL_INVERT                         0x150A
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_VENDOR                         0x1F00
-#define GL_RENDERER                       0x1F01
-#define GL_VERSION                        0x1F02
-#define GL_EXTENSIONS                     0x1F03
-#define GL_NEAREST                        0x2600
-#define GL_LINEAR                         0x2601
-#define GL_NEAREST_MIPMAP_NEAREST         0x2700
-#define GL_LINEAR_MIPMAP_NEAREST          0x2701
-#define GL_NEAREST_MIPMAP_LINEAR          0x2702
-#define GL_LINEAR_MIPMAP_LINEAR           0x2703
-#define GL_TEXTURE_MAG_FILTER             0x2800
-#define GL_TEXTURE_MIN_FILTER             0x2801
-#define GL_TEXTURE_WRAP_S                 0x2802
-#define GL_TEXTURE_WRAP_T                 0x2803
-#define GL_TEXTURE                        0x1702
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_REPEAT                         0x2901
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_SHADER_COMPILER                0x8DFA
-#define GL_SHADER_BINARY_FORMATS          0x8DF8
-#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
-#define GL_LOW_FLOAT                      0x8DF0
-#define GL_MEDIUM_FLOAT                   0x8DF1
-#define GL_HIGH_FLOAT                     0x8DF2
-#define GL_LOW_INT                        0x8DF3
-#define GL_MEDIUM_INT                     0x8DF4
-#define GL_HIGH_INT                       0x8DF5
-#define GL_FRAMEBUFFER                    0x8D40
-#define GL_RENDERBUFFER                   0x8D41
-#define GL_RGBA4                          0x8056
-#define GL_RGB5_A1                        0x8057
-#define GL_RGB565                         0x8D62
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_STENCIL_INDEX8                 0x8D48
-#define GL_RENDERBUFFER_WIDTH             0x8D42
-#define GL_RENDERBUFFER_HEIGHT            0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
-#define GL_RENDERBUFFER_RED_SIZE          0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-#define GL_COLOR_ATTACHMENT0              0x8CE0
-#define GL_DEPTH_ATTACHMENT               0x8D00
-#define GL_STENCIL_ATTACHMENT             0x8D20
-#define GL_NONE                           0
-#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9
-#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
-#define GL_FRAMEBUFFER_BINDING            0x8CA6
-#define GL_RENDERBUFFER_BINDING           0x8CA7
-#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
-#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
-GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture);
-GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
-GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
-GL_APICALL void GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer);
-GL_APICALL void GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
-GL_APICALL void GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
-GL_APICALL void GL_APIENTRY glBindTexture (GLenum target, GLuint texture);
-GL_APICALL void GL_APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-GL_APICALL void GL_APIENTRY glBlendEquation (GLenum mode);
-GL_APICALL void GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
-GL_APICALL void GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
-GL_APICALL void GL_APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-GL_APICALL void GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
-GL_APICALL void GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
-GL_APICALL GLenum GL_APIENTRY glCheckFramebufferStatus (GLenum target);
-GL_APICALL void GL_APIENTRY glClear (GLbitfield mask);
-GL_APICALL void GL_APIENTRY glClearColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-GL_APICALL void GL_APIENTRY glClearDepthf (GLfloat d);
-GL_APICALL void GL_APIENTRY glClearStencil (GLint s);
-GL_APICALL void GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-GL_APICALL void GL_APIENTRY glCompileShader (GLuint shader);
-GL_APICALL void GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
-GL_APICALL void GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
-GL_APICALL void GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GL_APICALL void GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL GLuint GL_APIENTRY glCreateProgram (void);
-GL_APICALL GLuint GL_APIENTRY glCreateShader (GLenum type);
-GL_APICALL void GL_APIENTRY glCullFace (GLenum mode);
-GL_APICALL void GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
-GL_APICALL void GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers);
-GL_APICALL void GL_APIENTRY glDeleteProgram (GLuint program);
-GL_APICALL void GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers);
-GL_APICALL void GL_APIENTRY glDeleteShader (GLuint shader);
-GL_APICALL void GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint *textures);
-GL_APICALL void GL_APIENTRY glDepthFunc (GLenum func);
-GL_APICALL void GL_APIENTRY glDepthMask (GLboolean flag);
-GL_APICALL void GL_APIENTRY glDepthRangef (GLfloat n, GLfloat f);
-GL_APICALL void GL_APIENTRY glDetachShader (GLuint program, GLuint shader);
-GL_APICALL void GL_APIENTRY glDisable (GLenum cap);
-GL_APICALL void GL_APIENTRY glDisableVertexAttribArray (GLuint index);
-GL_APICALL void GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
-GL_APICALL void GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const void *indices);
-GL_APICALL void GL_APIENTRY glEnable (GLenum cap);
-GL_APICALL void GL_APIENTRY glEnableVertexAttribArray (GLuint index);
-GL_APICALL void GL_APIENTRY glFinish (void);
-GL_APICALL void GL_APIENTRY glFlush (void);
-GL_APICALL void GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GL_APICALL void GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GL_APICALL void GL_APIENTRY glFrontFace (GLenum mode);
-GL_APICALL void GL_APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
-GL_APICALL void GL_APIENTRY glGenerateMipmap (GLenum target);
-GL_APICALL void GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers);
-GL_APICALL void GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers);
-GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint *textures);
-GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
-GL_APICALL GLint GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar *name);
-GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean *params);
-GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
-GL_APICALL GLenum GL_APIENTRY glGetError (void);
-GL_APICALL void GL_APIENTRY glGetFloatv (GLenum pname, GLfloat *params);
-GL_APICALL void GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-GL_APICALL void GL_APIENTRY glGetIntegerv (GLenum pname, GLint *params);
-GL_APICALL void GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params);
-GL_APICALL void GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-GL_APICALL void GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params);
-GL_APICALL void GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params);
-GL_APICALL void GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-GL_APICALL void GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
-GL_APICALL void GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-GL_APICALL const GLubyte *GL_APIENTRY glGetString (GLenum name);
-GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
-GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
-GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params);
-GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params);
-GL_APICALL GLint GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar *name);
-GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params);
-GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params);
-GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, void **pointer);
-GL_APICALL void GL_APIENTRY glHint (GLenum target, GLenum mode);
-GL_APICALL GLboolean GL_APIENTRY glIsBuffer (GLuint buffer);
-GL_APICALL GLboolean GL_APIENTRY glIsEnabled (GLenum cap);
-GL_APICALL GLboolean GL_APIENTRY glIsFramebuffer (GLuint framebuffer);
-GL_APICALL GLboolean GL_APIENTRY glIsProgram (GLuint program);
-GL_APICALL GLboolean GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer);
-GL_APICALL GLboolean GL_APIENTRY glIsShader (GLuint shader);
-GL_APICALL GLboolean GL_APIENTRY glIsTexture (GLuint texture);
-GL_APICALL void GL_APIENTRY glLineWidth (GLfloat width);
-GL_APICALL void GL_APIENTRY glLinkProgram (GLuint program);
-GL_APICALL void GL_APIENTRY glPixelStorei (GLenum pname, GLint param);
-GL_APICALL void GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
-GL_APICALL void GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels);
-GL_APICALL void GL_APIENTRY glReleaseShaderCompiler (void);
-GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-GL_APICALL void GL_APIENTRY glSampleCoverage (GLfloat value, GLboolean invert);
-GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
-GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
-GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
-GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
-GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask);
-GL_APICALL void GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
-GL_APICALL void GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
-GL_APICALL void GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-GL_APICALL void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
-GL_APICALL void GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
-GL_APICALL void GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params);
-GL_APICALL void GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
-GL_APICALL void GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params);
-GL_APICALL void GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
-GL_APICALL void GL_APIENTRY glUniform1f (GLint location, GLfloat v0);
-GL_APICALL void GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glUniform1i (GLint location, GLint v0);
-GL_APICALL void GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value);
-GL_APICALL void GL_APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
-GL_APICALL void GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glUniform2i (GLint location, GLint v0, GLint v1);
-GL_APICALL void GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value);
-GL_APICALL void GL_APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-GL_APICALL void GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2);
-GL_APICALL void GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value);
-GL_APICALL void GL_APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-GL_APICALL void GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-GL_APICALL void GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value);
-GL_APICALL void GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GL_APICALL void GL_APIENTRY glUseProgram (GLuint program);
-GL_APICALL void GL_APIENTRY glValidateProgram (GLuint program);
-GL_APICALL void GL_APIENTRY glVertexAttrib1f (GLuint index, GLfloat x);
-GL_APICALL void GL_APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v);
-GL_APICALL void GL_APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y);
-GL_APICALL void GL_APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v);
-GL_APICALL void GL_APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-GL_APICALL void GL_APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v);
-GL_APICALL void GL_APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GL_APICALL void GL_APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v);
-GL_APICALL void GL_APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
-GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
-#endif /* GL_ES_VERSION_2_0 */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

src/MagnumExternal/OpenGL/GLES2/gl2platform.h

@@ -1,30 +0,0 @@
-#ifndef __gl2platform_h_
-#define __gl2platform_h_
-
-/* $Revision: 23328 $ on $Date:: 2013-10-02 02:28:28 -0700 #$ */
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-/* Platform-specific types and definitions for OpenGL ES 2.X  gl2.h
- *
- * Adopters may modify khrplatform.h and this file to suit their platform.
- * You are encouraged to submit all modifications to the Khronos group so that
- * they can be included in future versions of this file.  Please submit changes
- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
- * by filing a bug against product "OpenGL-ES" component "Registry".
- */
-
-#include <KHR/khrplatform.h>
-
-#ifndef GL_APICALL
-#define GL_APICALL  KHRONOS_APICALL
-#endif
-
-#ifndef GL_APIENTRY
-#define GL_APIENTRY KHRONOS_APIENTRY
-#endif
-
-#endif /* __gl2platform_h_ */

src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt

@@ -23,4 +23,13 @@
 #   DEALINGS IN THE SOFTWARE.
 #
 
-install(FILES gl3.h gl3platform.h DESTINATION ${MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR}/OpenGL/GLES3)
+# flextGLPlatform.cpp is compiled as part of Magnum*Context libraries in Platform
+add_library(MagnumFlextGLObjects OBJECT flextGL.cpp)
+
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?Clang")
+    set_target_properties(MagnumFlextGLObjects PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -fvisibility=hidden -DFlextGL_EXPORTS")
+else()
+    set_target_properties(MagnumFlextGLObjects PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -DFlextGL_EXPORTS")
+endif()
+
+install(FILES flextGL.h DESTINATION ${MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR}/OpenGL/GLES3)

src/MagnumExternal/OpenGL/GLES3/README.md

@@ -0,0 +1,11 @@
+OpenGL header and extension loader is generated using flextGL, get it at
+[](https://github.com/ginkgo/flextGL).
+
+See [](extensions.txt) for requested version and a list of non-core extensions.
+Call `flextGLgen.py` in this directory with the following arguments:
+
+    .../flextGLgen.py -D . -t . extensions.txt
+
+It will generate `flextGL.h` and `flextGL.cpp` files. As usual, be sure to
+check the diff for suspicious changes and whitespace-at-EOL (although there
+shouldn't be any).

src/MagnumExternal/OpenGL/GLES3/extensions.txt

@@ -0,0 +1,28 @@
+# The following output is taken from `magnum-info` with removed `GL_` prefixes.
+
+version 3.1 es
+
+extension APPLE_texture_format_BGRA8888         optional
+extension CHROMIUM_map_sub                      optional
+extension EXT_texture_filter_anisotropic        optional
+extension EXT_texture_format_BGRA8888           optional
+extension EXT_read_format_bgra                  optional
+extension EXT_multi_draw_arrays                 optional
+extension EXT_debug_label                       optional
+extension EXT_debug_marker                      optional
+extension EXT_disjoint_timer_query              optional
+extension EXT_texture_sRGB_decode               optional
+extension EXT_separate_shader_objects           optional
+extension EXT_sRGB                              optional
+extension EXT_multisampled_render_to_texture    optional
+extension EXT_robustness                        optional
+extension KHR_debug                             optional
+extension NV_read_buffer_front                  optional
+extension NV_read_depth                         optional
+extension NV_read_stencil                       optional
+extension NV_read_depth_stencil                 optional
+extension NV_texture_border_clamp               optional
+extension OES_depth32                           optional
+extension OES_mapbuffer                         optional
+extension OES_stencil1                          optional
+extension OES_stencil4                          optional

src/MagnumExternal/OpenGL/GLES3/flextGL.cpp

@@ -0,0 +1,193 @@
+#include "flextGL.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* GL_ES_VERSION_3_1 */
+FLEXTGL_EXPORT void(APIENTRY *flextglDispatchCompute)(GLuint, GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDispatchComputeIndirect)(GLintptr) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDrawArraysIndirect)(GLenum, const void *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDrawElementsIndirect)(GLenum, GLenum, const void *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglFramebufferParameteri)(GLenum, GLenum, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetFramebufferParameteriv)(GLenum, GLenum, GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetProgramInterfaceiv)(GLuint, GLenum, GLenum, GLint *) = nullptr;
+FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetProgramResourceIndex)(GLuint, GLenum, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetProgramResourceName)(GLuint, GLenum, GLuint, GLsizei, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetProgramResourceiv)(GLuint, GLenum, GLuint, GLsizei, const GLenum *, GLsizei, GLsizei *, GLint *) = nullptr;
+FLEXTGL_EXPORT GLint(APIENTRY *flextglGetProgramResourceLocation)(GLuint, GLenum, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglUseProgramStages)(GLuint, GLbitfield, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglActiveShaderProgram)(GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateShaderProgramv)(GLenum, GLsizei, const GLchar *const*) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglBindProgramPipeline)(GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDeleteProgramPipelines)(GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGenProgramPipelines)(GLsizei, GLuint *) = nullptr;
+FLEXTGL_EXPORT GLboolean(APIENTRY *flextglIsProgramPipeline)(GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetProgramPipelineiv)(GLuint, GLenum, GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1i)(GLuint, GLint, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2i)(GLuint, GLint, GLint, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3i)(GLuint, GLint, GLint, GLint, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4i)(GLuint, GLint, GLint, GLint, GLint, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1ui)(GLuint, GLint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2ui)(GLuint, GLint, GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3ui)(GLuint, GLint, GLuint, GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4ui)(GLuint, GLint, GLuint, GLuint, GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1f)(GLuint, GLint, GLfloat) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2f)(GLuint, GLint, GLfloat, GLfloat) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3f)(GLuint, GLint, GLfloat, GLfloat, GLfloat) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4f)(GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1iv)(GLuint, GLint, GLsizei, const GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2iv)(GLuint, GLint, GLsizei, const GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3iv)(GLuint, GLint, GLsizei, const GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4iv)(GLuint, GLint, GLsizei, const GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1uiv)(GLuint, GLint, GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2uiv)(GLuint, GLint, GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3uiv)(GLuint, GLint, GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4uiv)(GLuint, GLint, GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1fv)(GLuint, GLint, GLsizei, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2fv)(GLuint, GLint, GLsizei, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3fv)(GLuint, GLint, GLsizei, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4fv)(GLuint, GLint, GLsizei, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix2fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix3fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix2x3fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix3x2fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix2x4fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x2fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix3x4fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x3fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglValidateProgramPipeline)(GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetProgramPipelineInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglBindImageTexture)(GLuint, GLuint, GLint, GLboolean, GLint, GLenum, GLenum) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetBooleani_v)(GLenum, GLuint, GLboolean *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglMemoryBarrier)(GLbitfield) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglMemoryBarrierByRegion)(GLbitfield) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglTexStorage2DMultisample)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLboolean) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetMultisamplefv)(GLenum, GLuint, GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglSampleMaski)(GLuint, GLbitfield) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetTexLevelParameteriv)(GLenum, GLint, GLenum, GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetTexLevelParameterfv)(GLenum, GLint, GLenum, GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglBindVertexBuffer)(GLuint, GLuint, GLintptr, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglVertexAttribFormat)(GLuint, GLint, GLenum, GLboolean, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglVertexAttribIFormat)(GLuint, GLint, GLenum, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglVertexAttribBinding)(GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglVertexBindingDivisor)(GLuint, GLuint) = nullptr;
+
+/* GL_EXT_multi_draw_arrays */
+FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawArraysEXT)(GLenum, const GLint *, const GLsizei *, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglMultiDrawElementsEXT)(GLenum, const GLsizei *, GLenum, const void *const*, GLsizei) = nullptr;
+
+/* GL_EXT_debug_label */
+FLEXTGL_EXPORT void(APIENTRY *flextglLabelObjectEXT)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabelEXT)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *) = nullptr;
+
+/* GL_EXT_debug_marker */
+FLEXTGL_EXPORT void(APIENTRY *flextglInsertEventMarkerEXT)(GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglPushGroupMarkerEXT)(GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglPopGroupMarkerEXT)(void) = nullptr;
+
+/* GL_EXT_disjoint_timer_query */
+FLEXTGL_EXPORT void(APIENTRY *flextglGenQueriesEXT)(GLsizei, GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDeleteQueriesEXT)(GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT GLboolean(APIENTRY *flextglIsQueryEXT)(GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglBeginQueryEXT)(GLenum, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglEndQueryEXT)(GLenum) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglQueryCounterEXT)(GLuint, GLenum) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetQueryivEXT)(GLenum, GLenum, GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetQueryObjectivEXT)(GLuint, GLenum, GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetQueryObjectuivEXT)(GLuint, GLenum, GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetQueryObjecti64vEXT)(GLuint, GLenum, GLint64 *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetQueryObjectui64vEXT)(GLuint, GLenum, GLuint64 *) = nullptr;
+
+/* GL_EXT_separate_shader_objects */
+FLEXTGL_EXPORT void(APIENTRY *flextglUseShaderProgramEXT)(GLenum, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglActiveProgramEXT)(GLuint) = nullptr;
+FLEXTGL_EXPORT GLuint(APIENTRY *flextglCreateShaderProgramEXT)(GLenum, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglActiveShaderProgramEXT)(GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglBindProgramPipelineEXT)(GLuint) = 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;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetProgramPipelineInfoLogEXT)(GLuint, GLsizei, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetProgramPipelineivEXT)(GLuint, GLenum, GLint *) = nullptr;
+FLEXTGL_EXPORT GLboolean(APIENTRY *flextglIsProgramPipelineEXT)(GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramParameteriEXT)(GLuint, GLenum, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1fEXT)(GLuint, GLint, GLfloat) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1fvEXT)(GLuint, GLint, GLsizei, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1iEXT)(GLuint, GLint, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1ivEXT)(GLuint, GLint, GLsizei, const GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2fEXT)(GLuint, GLint, GLfloat, GLfloat) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2fvEXT)(GLuint, GLint, GLsizei, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2iEXT)(GLuint, GLint, GLint, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2ivEXT)(GLuint, GLint, GLsizei, const GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3fEXT)(GLuint, GLint, GLfloat, GLfloat, GLfloat) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3fvEXT)(GLuint, GLint, GLsizei, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3iEXT)(GLuint, GLint, GLint, GLint, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3ivEXT)(GLuint, GLint, GLsizei, const GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4fEXT)(GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4fvEXT)(GLuint, GLint, GLsizei, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4iEXT)(GLuint, GLint, GLint, GLint, GLint, GLint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4ivEXT)(GLuint, GLint, GLsizei, const GLint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix2fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix3fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglUseProgramStagesEXT)(GLuint, GLbitfield, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglValidateProgramPipelineEXT)(GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1uiEXT)(GLuint, GLint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2uiEXT)(GLuint, GLint, GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3uiEXT)(GLuint, GLint, GLuint, GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4uiEXT)(GLuint, GLint, GLuint, GLuint, GLuint, GLuint) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform1uivEXT)(GLuint, GLint, GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform2uivEXT)(GLuint, GLint, GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform3uivEXT)(GLuint, GLint, GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniform4uivEXT)(GLuint, GLint, GLsizei, const GLuint *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix2x3fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix3x2fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix2x4fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x2fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix3x4fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglProgramUniformMatrix4x3fvEXT)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *) = nullptr;
+
+/* GL_EXT_multisampled_render_to_texture */
+FLEXTGL_EXPORT void(APIENTRY *flextglRenderbufferStorageMultisampleEXT)(GLenum, GLsizei, GLenum, GLsizei, GLsizei) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglFramebufferTexture2DMultisampleEXT)(GLenum, GLenum, GLenum, GLuint, GLint, GLsizei) = nullptr;
+
+/* GL_EXT_robustness */
+FLEXTGL_EXPORT GLenum(APIENTRY *flextglGetGraphicsResetStatusEXT)(void) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglReadnPixelsEXT)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformfvEXT)(GLuint, GLint, GLsizei, GLfloat *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetnUniformivEXT)(GLuint, GLint, GLsizei, GLint *) = nullptr;
+
+/* GL_KHR_debug */
+FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageControl)(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 *flextglDebugMessageCallback)(GLDEBUGPROC, const void *) = nullptr;
+FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetDebugMessageLog)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroup)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroup)(void) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabel)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabel)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabel)(const void *, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectPtrLabel)(const void *, GLsizei, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetPointerv)(GLenum, void **) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageControlKHR)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageInsertKHR)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglDebugMessageCallbackKHR)(GLDEBUGPROCKHR, const void *) = nullptr;
+FLEXTGL_EXPORT GLuint(APIENTRY *flextglGetDebugMessageLogKHR)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglPushDebugGroupKHR)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglPopDebugGroupKHR)(void) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglObjectLabelKHR)(GLenum, GLuint, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectLabelKHR)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglObjectPtrLabelKHR)(const void *, GLsizei, const GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetObjectPtrLabelKHR)(const void *, GLsizei, GLsizei *, GLchar *) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetPointervKHR)(GLenum, void **) = nullptr;
+
+/* GL_OES_mapbuffer */
+FLEXTGL_EXPORT void *(APIENTRY *flextglMapBufferOES)(GLenum, GLenum) = nullptr;
+FLEXTGL_EXPORT GLboolean(APIENTRY *flextglUnmapBufferOES)(GLenum) = nullptr;
+FLEXTGL_EXPORT void(APIENTRY *flextglGetBufferPointervOES)(GLenum, GLenum, void **) = nullptr;
+
+#ifdef __cplusplus
+}
+#endif

src/MagnumExternal/OpenGL/GLES3/flextGL.cpp.template

@@ -0,0 +1,20 @@
+@require(passthru, functions, enums, options, version, extensions)
+#include "flextGL.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+@for category,funcs in functions:
+@if len(funcs) > 0 and category not in ['ES_VERSION_2_0', 'ES_VERSION_3_0']:
+
+/* GL_@category */
+@for f in funcs:
+FLEXTGL_EXPORT @f.returntype\
+(APIENTRY *flextgl@f.name)(@f.param_type_list_string()) = nullptr;
+@end
+@end
+@end
+
+#ifdef __cplusplus
+}
+#endif