Browse Source

GL: wait, PrimitiveQuery isn't on ES2 at all, so why the ifdefs.

pull/483/head
Vladimír Vondruš 6 years ago
parent
commit
d51094e972
  1. 3
      src/Magnum/GL/PrimitiveQuery.h
  2. 6
      src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp

3
src/Magnum/GL/PrimitiveQuery.h

@ -59,14 +59,13 @@ class MAGNUM_GL_EXPORT PrimitiveQuery: public AbstractQuery {
* @m_enum_values_as_keywords * @m_enum_values_as_keywords
*/ */
enum class Target: GLenum { 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 * Count of primitives generated from vertex shader or geometry
* shader. When used with @ref begin(UnsignedInt), the index must * shader. When used with @ref begin(UnsignedInt), the index must
* be lower than @ref TransformFeedback::maxVertexStreams(). Use * be lower than @ref TransformFeedback::maxVertexStreams(). Use
* @ref result<UnsignedInt>() or @ref result<Int>() to retrieve the * @ref result<UnsignedInt>() or @ref result<Int>() to retrieve the
* result. * result.
* @requires_gles30 Not defined in OpenGL ES 2.0.
* @requires_gles32 Extension @gl_extension{ANDROID,extension_pack_es31a} / * @requires_gles32 Extension @gl_extension{ANDROID,extension_pack_es31a} /
* @gl_extension{EXT,geometry_shader} * @gl_extension{EXT,geometry_shader}
* @requires_gles Geometry shaders are not available in WebGL. * @requires_gles Geometry shaders are not available in WebGL.

6
src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp

@ -49,7 +49,7 @@ struct PrimitiveQueryGLTest: OpenGLTester {
void constructMove(); void constructMove();
void wrap(); void wrap();
#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) #ifndef MAGNUM_TARGET_WEBGL
void primitivesGenerated(); void primitivesGenerated();
#endif #endif
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
@ -65,7 +65,7 @@ PrimitiveQueryGLTest::PrimitiveQueryGLTest() {
addTests({&PrimitiveQueryGLTest::constructMove, addTests({&PrimitiveQueryGLTest::constructMove,
&PrimitiveQueryGLTest::wrap, &PrimitiveQueryGLTest::wrap,
#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) #ifndef MAGNUM_TARGET_WEBGL
&PrimitiveQueryGLTest::primitivesGenerated, &PrimitiveQueryGLTest::primitivesGenerated,
#endif #endif
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
@ -113,7 +113,7 @@ void PrimitiveQueryGLTest::wrap() {
glDeleteQueries(1, &id); glDeleteQueries(1, &id);
} }
#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) #ifndef MAGNUM_TARGET_WEBGL
void PrimitiveQueryGLTest::primitivesGenerated() { void PrimitiveQueryGLTest::primitivesGenerated() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::EXT::transform_feedback>()) if(!Context::current().isExtensionSupported<Extensions::EXT::transform_feedback>())

Loading…
Cancel
Save