From d51094e97271f4c34853552e4168d529c61d83d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 17 Nov 2020 23:22:56 +0100 Subject: [PATCH] GL: wait, PrimitiveQuery isn't on ES2 at all, so why the ifdefs. --- src/Magnum/GL/PrimitiveQuery.h | 3 +-- src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Magnum/GL/PrimitiveQuery.h b/src/Magnum/GL/PrimitiveQuery.h index a4affb10d..a58d980b7 100644 --- a/src/Magnum/GL/PrimitiveQuery.h +++ b/src/Magnum/GL/PrimitiveQuery.h @@ -59,14 +59,13 @@ class MAGNUM_GL_EXPORT PrimitiveQuery: public AbstractQuery { * @m_enum_values_as_keywords */ enum class Target: GLenum { - #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) + #ifndef MAGNUM_TARGET_WEBGL /** * Count of primitives generated from vertex shader or geometry * shader. When used with @ref begin(UnsignedInt), the index must * be lower than @ref TransformFeedback::maxVertexStreams(). Use * @ref result() or @ref result() to retrieve the * result. - * @requires_gles30 Not defined in OpenGL ES 2.0. * @requires_gles32 Extension @gl_extension{ANDROID,extension_pack_es31a} / * @gl_extension{EXT,geometry_shader} * @requires_gles Geometry shaders are not available in WebGL. diff --git a/src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp b/src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp index b6f0c6106..2c8595fcc 100644 --- a/src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp +++ b/src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp @@ -49,7 +49,7 @@ struct PrimitiveQueryGLTest: OpenGLTester { void constructMove(); void wrap(); - #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) + #ifndef MAGNUM_TARGET_WEBGL void primitivesGenerated(); #endif #ifndef MAGNUM_TARGET_GLES @@ -65,7 +65,7 @@ PrimitiveQueryGLTest::PrimitiveQueryGLTest() { addTests({&PrimitiveQueryGLTest::constructMove, &PrimitiveQueryGLTest::wrap, - #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) + #ifndef MAGNUM_TARGET_WEBGL &PrimitiveQueryGLTest::primitivesGenerated, #endif #ifndef MAGNUM_TARGET_GLES @@ -113,7 +113,7 @@ void PrimitiveQueryGLTest::wrap() { glDeleteQueries(1, &id); } -#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) +#ifndef MAGNUM_TARGET_WEBGL void PrimitiveQueryGLTest::primitivesGenerated() { #ifndef MAGNUM_TARGET_GLES if(!Context::current().isExtensionSupported())