Merge branch 'master' into compatibility

package/ci/jenkins-nacl.xml

@@ -68,7 +68,7 @@ else
 fi
 
 mkdir -p build-nacl-${toolchain}-${compatibility}
-cd build-mingw32-${toolchain}-${compatibility}
+cd build-nacl-${toolchain}-${compatibility}
 
 cmake .. \
     -DCMAKE_BUILD_TYPE=Release \

src/Magnum/AbstractObject.cpp

@@ -83,8 +83,13 @@ namespace {
             /**
              * @todo Shouldn't ES2's KHR_debug have `GL_TRANSFORM_FEEDBACK_KHR`
              *      instead of `GL_TRANSFORM_FEEDBACK`? (it's a new enum in 2.0)
+             *      NaCl extension header doesn't have it at all. Also the
+             *      original @es_extension{EXT,debug_label} mentions it only
+             *      for ES3 (i.e. no mention of @es_extension{EXT,transform_feedback})
              */
+            #ifndef CORRADE_TARGET_NACL
             case GL_TRANSFORM_FEEDBACK:
+            #endif
             #ifndef MAGNUM_TARGET_GLES
             case GL_SAMPLER:
             #else

src/Magnum/Platform/Sdl2Application.h

@@ -404,11 +404,15 @@ class Sdl2Application::Configuration {
         /**
          * @brief Window flags
          *
-         * @see @ref setFlags()
+         * @see @ref setWindowFlags()
          */
+        #ifndef DOXYGEN_GENERATING_OUTPUT
         typedef Containers::EnumSet<WindowFlag, Uint32, SDL_WINDOW_RESIZABLE|
             SDL_WINDOW_FULLSCREEN|SDL_WINDOW_HIDDEN|SDL_WINDOW_MAXIMIZED|
             SDL_WINDOW_MINIMIZED|SDL_WINDOW_INPUT_GRABBED> WindowFlags;
+        #else
+        typedef Containers::EnumSet<WindowFlag, Uint32> WindowFlags;
+        #endif
 
         #ifdef MAGNUM_BUILD_DEPRECATED
         /**

src/Magnum/Query.cpp

@@ -82,7 +82,7 @@ bool AbstractQuery::resultAvailable() {
     #ifndef MAGNUM_TARGET_GLES2
     glGetQueryObjectuiv(_id, GL_QUERY_RESULT_AVAILABLE, &result);
     #elif defined(CORRADE_TARGET_NACL)
-    glGetQueryObjectuivEXT(_id, GL_QUERY_RESULT_AVAILABLE, &result);
+    glGetQueryObjectuivEXT(_id, GL_QUERY_RESULT_AVAILABLE_EXT, &result);
     #else
     CORRADE_INTERNAL_ASSERT(false);
     #endif
@@ -98,7 +98,7 @@ template<> UnsignedInt AbstractQuery::result<UnsignedInt>() {
     #ifndef MAGNUM_TARGET_GLES2
     glGetQueryObjectuiv(_id, GL_QUERY_RESULT, &result);
     #elif defined(CORRADE_TARGET_NACL)
-    glGetQueryObjectuivEXT(_id, GL_QUERY_RESULT, &result);
+    glGetQueryObjectuivEXT(_id, GL_QUERY_RESULT_EXT, &result);
     #else
     CORRADE_INTERNAL_ASSERT(false);
     #endif
@@ -115,7 +115,7 @@ template<> Int AbstractQuery::result<Int>() {
     #ifndef MAGNUM_TARGET_GLES
     glGetQueryObjectiv(_id, GL_QUERY_RESULT, &result);
     #elif defined(CORRADE_TARGET_NACL)
-    glGetQueryObjectivEXT(_id, GL_QUERY_RESULT, &result);
+    glGetQueryObjectivEXT(_id, GL_QUERY_RESULT_EXT, &result);
     #else
     CORRADE_INTERNAL_ASSERT(false);
     #endif