diff --git a/src/Query.cpp b/src/Query.cpp index 1e3adfa56..d847bb635 100644 --- a/src/Query.cpp +++ b/src/Query.cpp @@ -90,21 +90,6 @@ bool AbstractQuery::resultAvailable() { } #ifndef DOXYGEN_GENERATING_OUTPUT -template<> bool AbstractQuery::result() { - CORRADE_ASSERT(!target, "AbstractQuery::result(): the query is currently running", {}); - - /** @todo Re-enable when extension loader is available for ES */ - GLuint result; - #ifndef MAGNUM_TARGET_GLES2 - glGetQueryObjectuiv(_id, GL_QUERY_RESULT, &result); - #elif defined(CORRADE_TARGET_NACL) - glGetQueryObjectuivEXT(_id, GL_QUERY_RESULT, &result); - #else - CORRADE_INTERNAL_ASSERT(false); - #endif - return result == GL_TRUE; -} - template<> UnsignedInt AbstractQuery::result() { CORRADE_ASSERT(!target, "AbstractQuery::result(): the query is currently running", {}); @@ -120,6 +105,8 @@ template<> UnsignedInt AbstractQuery::result() { return result; } +template<> bool AbstractQuery::result() { return result() != 0; } + template<> Int AbstractQuery::result() { CORRADE_ASSERT(!target, "AbstractQuery::result(): the query is currently running", {});