From 0715bf89ea8d4e30a430de3acce3020baeda7fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 25 May 2015 00:14:17 +0200 Subject: [PATCH] Fix query tests on ES2. --- src/Magnum/Test/SampleQueryGLTest.cpp | 8 ++++++++ src/Magnum/Test/TimeQueryGLTest.cpp | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/Magnum/Test/SampleQueryGLTest.cpp b/src/Magnum/Test/SampleQueryGLTest.cpp index 0e9065de6..27ae11e4c 100644 --- a/src/Magnum/Test/SampleQueryGLTest.cpp +++ b/src/Magnum/Test/SampleQueryGLTest.cpp @@ -66,7 +66,11 @@ void SampleQueryGLTest::wrap() { #endif GLuint id; + #ifndef MAGNUM_TARGET_GLES2 glGenQueries(1, &id); + #else + glGenQueriesEXT(1, &id); + #endif /* Releasing won't delete anything */ { @@ -76,7 +80,11 @@ void SampleQueryGLTest::wrap() { /* ...so we can wrap it again */ SampleQuery::wrap(id, SampleQuery::Target::AnySamplesPassed); + #ifndef MAGNUM_TARGET_GLES2 glDeleteQueries(1, &id); + #else + glDeleteQueriesEXT(1, &id); + #endif } namespace { diff --git a/src/Magnum/Test/TimeQueryGLTest.cpp b/src/Magnum/Test/TimeQueryGLTest.cpp index 3948aaff7..eb4fea632 100644 --- a/src/Magnum/Test/TimeQueryGLTest.cpp +++ b/src/Magnum/Test/TimeQueryGLTest.cpp @@ -54,7 +54,11 @@ void TimeQueryGLTest::wrap() { #endif GLuint id; + #ifndef MAGNUM_TARGET_GLES2 glGenQueries(1, &id); + #else + glGenQueriesEXT(1, &id); + #endif /* Releasing won't delete anything */ { @@ -64,7 +68,11 @@ void TimeQueryGLTest::wrap() { /* ...so we can wrap it again */ TimeQuery::wrap(id, TimeQuery::Target::TimeElapsed); + #ifndef MAGNUM_TARGET_GLES2 glDeleteQueries(1, &id); + #else + glDeleteQueriesEXT(1, &id); + #endif } void TimeQueryGLTest::queryTime() {