From f7a3b74083cd955433063b28346e83faee165404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 19 Jan 2014 12:59:09 +0100 Subject: [PATCH 1/3] package: fix NaCl Jenkins configuration. --- package/ci/jenkins-nacl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ci/jenkins-nacl.xml b/package/ci/jenkins-nacl.xml index a975bd245..7f3dc0453 100644 --- a/package/ci/jenkins-nacl.xml +++ b/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 \ From cc9e6c616195f7079bc27c9bc8d325ef21c7079a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 19 Jan 2014 12:59:48 +0100 Subject: [PATCH 2/3] Fix NaCl build. Apparently I enabled the queries for NaCl without testing at all. --- src/Magnum/AbstractObject.cpp | 5 +++++ src/Magnum/Query.cpp | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Magnum/AbstractObject.cpp b/src/Magnum/AbstractObject.cpp index 2c55735e0..4ffeb39c6 100644 --- a/src/Magnum/AbstractObject.cpp +++ b/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 diff --git a/src/Magnum/Query.cpp b/src/Magnum/Query.cpp index f1233c222..a547852dd 100644 --- a/src/Magnum/Query.cpp +++ b/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() { #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() { #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 From 6f58bfd4e338c59252ff3fa1a99295f21f705b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 19 Jan 2014 13:00:52 +0100 Subject: [PATCH 3/3] Platform: fix documentation. The templates arguments were breaking the doc layout badly, hiding them for documentation. --- src/Magnum/Platform/Sdl2Application.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index 4ffa238ea..476c4c9de 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -396,11 +396,15 @@ class Sdl2Application::Configuration { /** * @brief Window flags * - * @see @ref setFlags() + * @see @ref setWindowFlags() */ + #ifndef DOXYGEN_GENERATING_OUTPUT typedef Containers::EnumSet WindowFlags; + #else + typedef Containers::EnumSet WindowFlags; + #endif #ifdef MAGNUM_BUILD_DEPRECATED /**