From fc523595e1430003788feb69264142ae34aea4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 6 Jul 2015 13:16:55 +0200 Subject: [PATCH] Document that KHR_debug is covered by AEP too. So one can just check for ANDROID_extension_pack_es31a and not for all the twenty particular ones. --- src/Magnum/AbstractObject.h | 5 ++-- src/Magnum/AbstractQuery.h | 10 ++++--- src/Magnum/AbstractShaderProgram.h | 10 ++++--- src/Magnum/AbstractTexture.h | 10 ++++--- src/Magnum/Buffer.h | 10 ++++--- src/Magnum/Context.h | 5 ++-- src/Magnum/DebugOutput.h | 48 ++++++++++++++++++------------ src/Magnum/Framebuffer.h | 10 ++++--- src/Magnum/Mesh.h | 10 ++++--- src/Magnum/Renderbuffer.h | 10 ++++--- src/Magnum/Renderer.h | 12 +++++--- src/Magnum/Shader.h | 10 ++++--- src/Magnum/TransformFeedback.h | 10 ++++--- 13 files changed, 97 insertions(+), 63 deletions(-) diff --git a/src/Magnum/AbstractObject.h b/src/Magnum/AbstractObject.h index 4d97704ac..60fa9cfae 100644 --- a/src/Magnum/AbstractObject.h +++ b/src/Magnum/AbstractObject.h @@ -89,8 +89,9 @@ class MAGNUM_EXPORT AbstractObject { * * The result is cached, repeated queries don't result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and @extension{KHR,debug} - * desktop or ES extension is not available, returns `0`. Note that - * @extension2{EXT,debug_label} has no such limit. + * desktop or ES extension (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * is not available, returns `0`. Note that @extension2{EXT,debug_label} + * has no such limit. * @see @ref AbstractQuery::setLabel(), @ref AbstractShaderProgram::setLabel(), * @ref AbstractTexture::setLabel(), @ref Buffer::setLabel(), * @ref BufferTexture::setLabel(), @ref Framebuffer::setLabel(), diff --git a/src/Magnum/AbstractQuery.h b/src/Magnum/AbstractQuery.h index 8b2899205..2f0427874 100644 --- a/src/Magnum/AbstractQuery.h +++ b/src/Magnum/AbstractQuery.h @@ -87,8 +87,9 @@ class MAGNUM_EXPORT AbstractQuery: public AbstractObject { * * The result is *not* cached, repeated queries will result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function returns empty string. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function returns empty string. * @see @fn_gl{GetObjectLabel} with @def_gl{QUERY} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{QUERY_OBJECT_EXT} @@ -101,8 +102,9 @@ class MAGNUM_EXPORT AbstractQuery: public AbstractObject { * @return Reference to self (for method chaining) * * Default is empty string. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function does nothing. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function does nothing. * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @def_gl{QUERY} or @fn_gl_extension2{LabelObject,EXT,debug_label} * with @def_gl{QUERY_OBJECT_EXT} diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h index be99fd661..8c568430c 100644 --- a/src/Magnum/AbstractShaderProgram.h +++ b/src/Magnum/AbstractShaderProgram.h @@ -612,8 +612,9 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { * * The result is *not* cached, repeated queries will result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function returns empty string. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function returns empty string. * @see @fn_gl{GetObjectLabel} with @def_gl{PROGRAM} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{PROGRAM_OBJECT_EXT} @@ -626,8 +627,9 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { * @return Reference to self (for method chaining) * * Default is empty string. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function does nothing. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function does nothing. * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @def_gl{PROGRAM} or @fn_gl_extension2{LabelObject,EXT,debug_label} * with @def_gl{PROGRAM_OBJECT_EXT} diff --git a/src/Magnum/AbstractTexture.h b/src/Magnum/AbstractTexture.h index 7c98a8075..d16965794 100644 --- a/src/Magnum/AbstractTexture.h +++ b/src/Magnum/AbstractTexture.h @@ -284,8 +284,9 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { * * The result is *not* cached, repeated queries will result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function returns empty string. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function returns empty string. * @see @fn_gl{GetObjectLabel} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{TEXTURE} @@ -298,8 +299,9 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { * @return Reference to self (for method chaining) * * Default is empty string. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function does nothing. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function does nothing. * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or * @fn_gl_extension2{LabelObject,EXT,debug_label} with * @def_gl{TEXTURE} diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h index f3a963d8d..ddf6c1703 100644 --- a/src/Magnum/Buffer.h +++ b/src/Magnum/Buffer.h @@ -913,8 +913,9 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { * * The result is *not* cached, repeated queries will result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function returns empty string. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function returns empty string. * @see @fn_gl{GetObjectLabel} with @def_gl{BUFFER} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{BUFFER_OBJECT_EXT} @@ -927,8 +928,9 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { * @return Reference to self (for method chaining) * * Default is empty string. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function does nothing. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function does nothing. * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with @def_gl{BUFFER} * or @fn_gl_extension2{LabelObject,EXT,debug_label} with * @def_gl{BUFFER_OBJECT_EXT} diff --git a/src/Magnum/Context.h b/src/Magnum/Context.h index bf75ffb5f..7b4e1ad2f 100644 --- a/src/Magnum/Context.h +++ b/src/Magnum/Context.h @@ -108,8 +108,9 @@ class MAGNUM_EXPORT Context { enum class Flag: GLint { /** * Debug context - * @requires_gl43 Extension @es_extension{KHR,debug} - * @requires_es_extension Extension @es_extension{KHR,debug} + * @requires_gl43 Extension @extension{KHR,debug} + * @requires_es_extension Extension @es_extension{ANDROID,extension_pack_es31a}/ + * @es_extension2{KHR,debug,debug} */ #ifndef MAGNUM_TARGET_GLES Debug = GL_CONTEXT_FLAG_DEBUG_BIT, diff --git a/src/Magnum/DebugOutput.h b/src/Magnum/DebugOutput.h index b7570a7e8..344b412ba 100644 --- a/src/Magnum/DebugOutput.h +++ b/src/Magnum/DebugOutput.h @@ -59,9 +59,10 @@ stream in various graphics debuggers, such as Apitrace or gDEBugger. ## Basic usage Support for debug output is provided by OpenGL 4.3 or @extension{KHR,debug} -(desktop/ES extension). Subset of the functionality is provided also by -@extension2{EXT,debug_marker} (desktop/ES extensions) or -@extension{GREMEDY,string_marker} (desktop only extension). +(desktop/ES extension, covered also by @es_extension{ANDROID,extension_pack_es31a}). +Subset of the functionality is provided also by @extension2{EXT,debug_marker} +(desktop/ES extensions) or @extension{GREMEDY,string_marker} (desktop only +extension). With OpenGL 4.3 or @extension{KHR,debug} desktop/ES extension, the debug output needs to be enabled first. It can be enabled globally using @@ -300,7 +301,8 @@ class MAGNUM_EXPORT DebugOutput { * * The result is cached, repeated queries don't result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and @extension{KHR,debug} - * desktop or ES extension is not available, returns `0`. + * desktop or ES extension (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * is not available, returns `0`. * @see @fn_gl{Get} with @def_gl{MAX_DEBUG_LOGGED_MESSAGES} */ static Int maxLoggedMessages(); @@ -310,7 +312,8 @@ class MAGNUM_EXPORT DebugOutput { * * The result is cached, repeated queries don't result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and @extension{KHR,debug} - * desktop or ES extension is not available, returns `0`. + * desktop or ES extension (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * is not available, returns `0`. * @see @fn_gl{Get} with @def_gl{MAX_DEBUG_MESSAGE_LENGTH} */ static Int maxMessageLength(); @@ -325,7 +328,8 @@ class MAGNUM_EXPORT DebugOutput { * for more information. * * If OpenGL 4.3 is not supported and @extension{KHR,debug} desktop or - * ES extension is not available, this function does nothing. + * ES extension (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * is not available, this function does nothing. * @see @ref Renderer::Feature::DebugOutput, @fn_gl{DebugMessageControl} */ static void setEnabled(Source source, Type type, std::initializer_list ids, bool enabled) { @@ -377,7 +381,8 @@ class MAGNUM_EXPORT DebugOutput { * * The messages are sent to the callback only if * @ref Renderer::Feature::DebugOutput is enabled. If OpenGL 4.3 is not - * supported and @extension{KHR,debug} desktop or ES extension is not + * supported and @extension{KHR,debug} desktop or ES extension (covered + * also by @es_extension{ANDROID,extension_pack_es31a}) is not * available, this function does nothing. * @see @ref setDefaultCallback(), * @ref Renderer::Feature::DebugOutputSynchronous, @@ -432,10 +437,10 @@ gDEBugger. See @ref DebugOutput for introduction. -If OpenGL 4.3 is supported or @extension{KHR,debug} desktop or ES extension is -available and default debug output callback is enabled for given kind of -messages, the inserted message will be printed on standard output in the -following form: +If OpenGL 4.3 is supported or @extension{KHR,debug} desktop or ES extension +(covered also by @es_extension{ANDROID,extension_pack_es31a}) is available and +default debug output callback is enabled for given kind of messages, the +inserted message will be printed on standard output in the following form: @code DebugMessage::insert(DebugMessage::Source::Application, DebugMessage::Type::Marker, @@ -650,7 +655,8 @@ class MAGNUM_EXPORT DebugMessage { * @param severity Message severity * @param string The actual message * - * If OpenGL 4.3 is not supported and neither @extension{KHR,debug} nor + * If OpenGL 4.3 is not supported and neither @extension{KHR,debug} + * (covered also by @es_extension{ANDROID,extension_pack_es31a}) nor * @extension2{EXT,debug_marker} (desktop or ES extensions) nor * @extension{GREMEDY,string_marker} (desktop only extension) are * available, this function does nothing. @@ -729,10 +735,11 @@ Renderer::disable(Renderer::Feature::Blending); group.pop(); @endcode -If OpenGL 4.3 is supported or @extension{KHR,debug} desktop or ES extension is -available and the default debug output callback is enabled for these kinds of -messages, the group entering and leaving will be printed on standard output in -the following form: +If OpenGL 4.3 is supported or @extension{KHR,debug} desktop or ES extension +(covered also by @es_extension{ANDROID,extension_pack_es31a}) is available and +the default debug output callback is enabled for these kinds of messages, the +group entering and leaving will be printed on standard output in the following +form: > Debug output: application debug group enter (42): Scene rendering\n > Debug output: application debug group leave (42): Scene rendering @@ -800,7 +807,8 @@ class MAGNUM_EXPORT DebugGroup { * * The result is cached, repeated queries don't result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and @extension{KHR,debug} - * desktop or ES extension is not available, returns `0`. + * desktop or ES extension (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * is not available, returns `0`. * @see @fn_gl{Get} with @def_gl{MAX_DEBUG_GROUP_STACK_DEPTH} */ static Int maxStackDepth(); @@ -842,7 +850,8 @@ class MAGNUM_EXPORT DebugGroup { * @ref DebugOutput::Type::PushGroup and * @ref DebugOutput::Severity::Notification. * - * If OpenGL 4.3 is not supported and neither @extension{KHR,debug} nor + * If OpenGL 4.3 is not supported and neither @extension{KHR,debug} + * (covered also by @es_extension{ANDROID,extension_pack_es31a}) nor * @extension2{EXT,debug_marker} is available, this function does * nothing. If @extension{KHR,debug} is not available and only * @extension2{EXT,debug_marker} is available, only @p message is used @@ -870,7 +879,8 @@ class MAGNUM_EXPORT DebugGroup { * @ref DebugOutput::Type::PopGroup and * @ref DebugOutput::Severity::Notification. * - * If OpenGL 4.3 is not supported and neither @extension{KHR,debug} nor + * If OpenGL 4.3 is not supported and neither @extension{KHR,debug} + * (covered also by @es_extension{ANDROID,extension_pack_es31a}) nor * @extension2{EXT,debug_marker} is available, this function does * nothing. * @see @ref push(), @ref Renderer::Error::StackUnderflow, diff --git a/src/Magnum/Framebuffer.h b/src/Magnum/Framebuffer.h index 8a7d961c7..55862c01d 100644 --- a/src/Magnum/Framebuffer.h +++ b/src/Magnum/Framebuffer.h @@ -394,8 +394,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * * The result is *not* cached, repeated queries will result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function returns empty string. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function returns empty string. * @see @fn_gl{GetObjectLabel} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{FRAMEBUFFER} @@ -408,8 +409,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * @return Reference to self (for method chaining) * * Default is empty string. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function does nothing. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function does nothing. * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or * @fn_gl_extension2{LabelObject,EXT,debug_label} with * @def_gl{FRAMEBUFFER} diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h index 14965c1b9..3f862e0ba 100644 --- a/src/Magnum/Mesh.h +++ b/src/Magnum/Mesh.h @@ -532,8 +532,9 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { * * The result is *not* cached, repeated queries will result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function returns empty string. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function returns empty string. * @see @fn_gl{GetObjectLabel} with @def_gl{VERTEX_ARRAY} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{VERTEX_ARRAY_OBJECT_EXT} @@ -546,8 +547,9 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { * @return Reference to self (for method chaining) * * Default is empty string. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function does nothing. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function does nothing. * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @def_gl{VERTEX_ARRAY} or @fn_gl_extension2{LabelObject,EXT,debug_label} * with @def_gl{VERTEX_ARRAY_OBJECT_EXT} diff --git a/src/Magnum/Renderbuffer.h b/src/Magnum/Renderbuffer.h index f19b3a73a..7ee62bd57 100644 --- a/src/Magnum/Renderbuffer.h +++ b/src/Magnum/Renderbuffer.h @@ -164,8 +164,9 @@ class MAGNUM_EXPORT Renderbuffer: public AbstractObject { * * The result is *not* cached, repeated queries will result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function returns empty string. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function returns empty string. * @see @fn_gl{GetObjectLabel} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{RENDERBUFFER} @@ -178,8 +179,9 @@ class MAGNUM_EXPORT Renderbuffer: public AbstractObject { * @return Reference to self (for method chaining) * * Default is empty string. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function does nothing. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function does nothing. * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or * @fn_gl_extension2{LabelObject,EXT,debug_label} with * @def_gl{RENDERBUFFER} diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h index d358604f7..0691271e7 100644 --- a/src/Magnum/Renderer.h +++ b/src/Magnum/Renderer.h @@ -91,7 +91,8 @@ class MAGNUM_EXPORT Renderer { * @see @ref DebugOutput, @ref Feature::DebugOutputSynchronous, * @ref Platform::Sdl2Application::Configuration::Flag::Debug "Platform::*Application::Configuration::Flag::Debug" * @requires_gl43 Extension @extension{KHR,debug} - * @requires_es_extension Extension @es_extension2{KHR,debug,debug} + * @requires_es_extension Extension @es_extension{ANDROID,extension_pack_es31a}/ + * @es_extension2{KHR,debug,debug} * @requires_gles Debug output is not available in WebGL. */ #ifndef MAGNUM_TARGET_GLES @@ -105,7 +106,8 @@ class MAGNUM_EXPORT Renderer { * @ref Feature::DebugOutput is enabled. * @see @ref DebugMessage * @requires_gl43 Extension @extension{KHR,debug} - * @requires_es_extension Extension @es_extension2{KHR,debug,debug} + * @requires_es_extension Extension @es_extension{ANDROID,extension_pack_es31a}/ + * @es_extension2{KHR,debug,debug} * @requires_gles Debug output is not available in WebGL. */ #ifndef MAGNUM_TARGET_GLES @@ -1032,7 +1034,8 @@ class MAGNUM_EXPORT Renderer { * Given operation would cause an internal stack to underflow. * @see @ref DebugGroup * @requires_gl43 Extension @extension{KHR,debug} - * @requires_es_extension Extension @es_extension2{KHR,debug,debug} + * @requires_es_extension Extension @es_extension{ANDROID,extension_pack_es31a}/ + * @es_extension2{KHR,debug,debug} * @requires_gles Debug output is not available in WebGL. */ #ifndef MAGNUM_TARGET_GLES @@ -1045,7 +1048,8 @@ class MAGNUM_EXPORT Renderer { * Given operation would cause an internal stack to overflow. * @see @ref DebugGroup * @requires_gl43 Extension @extension{KHR,debug} - * @requires_es_extension Extension @es_extension2{KHR,debug,debug} + * @requires_es_extension Extension @es_extension{ANDROID,extension_pack_es31a}/ + * @es_extension2{KHR,debug,debug} * @requires_gles Debug output is not available in WebGL. */ #ifndef MAGNUM_TARGET_GLES diff --git a/src/Magnum/Shader.h b/src/Magnum/Shader.h index 4f4e84107..937536864 100644 --- a/src/Magnum/Shader.h +++ b/src/Magnum/Shader.h @@ -517,8 +517,9 @@ class MAGNUM_EXPORT Shader: public AbstractObject { * * The result is *not* cached, repeated queries will result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function returns empty string. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function returns empty string. * @see @fn_gl{GetObjectLabel} with @def_gl{SHADER} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{SHADER_OBJECT_EXT} @@ -531,8 +532,9 @@ class MAGNUM_EXPORT Shader: public AbstractObject { * @return Reference to self (for method chaining) * * Default is empty string. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function does nothing. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function does nothing. * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @def_gl{SHADER} or @fn_gl_extension2{LabelObject,EXT,debug_label} * with @def_gl{SHADER_OBJECT_EXT} diff --git a/src/Magnum/TransformFeedback.h b/src/Magnum/TransformFeedback.h index 87a259c0d..13a89602d 100644 --- a/src/Magnum/TransformFeedback.h +++ b/src/Magnum/TransformFeedback.h @@ -224,8 +224,9 @@ class MAGNUM_EXPORT TransformFeedback: public AbstractObject { * * The result is *not* cached, repeated queries will result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function returns empty string. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function returns empty string. * @see @fn_gl{GetObjectLabel} or @fn_gl_extension2{GetObjectLabel,EXT,debug_label} * with @def_gl{TRANSFORM_FEEDBACK} * @requires_gles Debug output is not available in WebGL. @@ -237,8 +238,9 @@ class MAGNUM_EXPORT TransformFeedback: public AbstractObject { * @return Reference to self (for method chaining) * * Default is empty string. If OpenGL 4.3 is not supported and neither - * @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES - * extension is available, this function does nothing. + * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a}) + * nor @extension2{EXT,debug_label} desktop or ES extension is + * available, this function does nothing. * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or * @fn_gl_extension2{LabelObject,EXT,debug_label} with * @def_gl{TRANSFORM_FEEDBACK}