ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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.
pull/107/head
Vladimír Vondruš 11 years ago
parent
c0baad30a2
commit
fc523595e1
13 changed files with 97 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/Magnum/AbstractObject.h
  2. 10
      src/Magnum/AbstractQuery.h
  3. 10
      src/Magnum/AbstractShaderProgram.h
  4. 10
      src/Magnum/AbstractTexture.h
  5. 10
      src/Magnum/Buffer.h
  6. 5
      src/Magnum/Context.h
  7. 48
      src/Magnum/DebugOutput.h
  8. 10
      src/Magnum/Framebuffer.h
  9. 10
      src/Magnum/Mesh.h
  10. 10
      src/Magnum/Renderbuffer.h
  11. 12
      src/Magnum/Renderer.h
  12. 10
      src/Magnum/Shader.h
  13. 10
      src/Magnum/TransformFeedback.h

5
src/Magnum/AbstractObject.h
Unescape View File

@ -89,8 +89,9 @@ class MAGNUM_EXPORT AbstractObject {
* *
* The result is cached, repeated queries don't result in repeated * The result is cached, repeated queries don't result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and @extension{KHR,debug} * OpenGL calls. If OpenGL 4.3 is not supported and @extension{KHR,debug}
* desktop or ES extension is not available, returns `0`. Note that * desktop or ES extension (covered also by @es_extension{ANDROID,extension_pack_es31a})
* @extension2{EXT,debug_label} has no such limit. * is not available, returns `0`. Note that @extension2{EXT,debug_label}
* has no such limit.
* @see @ref AbstractQuery::setLabel(), @ref AbstractShaderProgram::setLabel(), * @see @ref AbstractQuery::setLabel(), @ref AbstractShaderProgram::setLabel(),
* @ref AbstractTexture::setLabel(), @ref Buffer::setLabel(), * @ref AbstractTexture::setLabel(), @ref Buffer::setLabel(),
* @ref BufferTexture::setLabel(), @ref Framebuffer::setLabel(), * @ref BufferTexture::setLabel(), @ref Framebuffer::setLabel(),

10
src/Magnum/AbstractQuery.h
Unescape View File

@ -87,8 +87,9 @@ class MAGNUM_EXPORT AbstractQuery: public AbstractObject {
* *
* The result is *not* cached, repeated queries will result in repeated * The result is *not* cached, repeated queries will result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and neither * OpenGL calls. If OpenGL 4.3 is not supported and neither
* @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function returns empty string. * 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 * @see @fn_gl{GetObjectLabel} with @def_gl{QUERY} or
* @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{QUERY_OBJECT_EXT} * @def_gl{QUERY_OBJECT_EXT}
@ -101,8 +102,9 @@ class MAGNUM_EXPORT AbstractQuery: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If OpenGL 4.3 is not supported and neither * 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{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function does nothing. * nor @extension2{EXT,debug_label} desktop or ES extension is
* available, this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with
* @def_gl{QUERY} or @fn_gl_extension2{LabelObject,EXT,debug_label} * @def_gl{QUERY} or @fn_gl_extension2{LabelObject,EXT,debug_label}
* with @def_gl{QUERY_OBJECT_EXT} * with @def_gl{QUERY_OBJECT_EXT}

10
src/Magnum/AbstractShaderProgram.h
Unescape View File

@ -612,8 +612,9 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
* *
* The result is *not* cached, repeated queries will result in repeated * The result is *not* cached, repeated queries will result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and neither * OpenGL calls. If OpenGL 4.3 is not supported and neither
* @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function returns empty string. * 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 * @see @fn_gl{GetObjectLabel} with @def_gl{PROGRAM} or
* @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{PROGRAM_OBJECT_EXT} * @def_gl{PROGRAM_OBJECT_EXT}
@ -626,8 +627,9 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If OpenGL 4.3 is not supported and neither * 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{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function does nothing. * nor @extension2{EXT,debug_label} desktop or ES extension is
* available, this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with
* @def_gl{PROGRAM} or @fn_gl_extension2{LabelObject,EXT,debug_label} * @def_gl{PROGRAM} or @fn_gl_extension2{LabelObject,EXT,debug_label}
* with @def_gl{PROGRAM_OBJECT_EXT} * with @def_gl{PROGRAM_OBJECT_EXT}

10
src/Magnum/AbstractTexture.h
Unescape View File

@ -284,8 +284,9 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
* *
* The result is *not* cached, repeated queries will result in repeated * The result is *not* cached, repeated queries will result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and neither * OpenGL calls. If OpenGL 4.3 is not supported and neither
* @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function returns empty string. * nor @extension2{EXT,debug_label} desktop or ES extension is
* available, this function returns empty string.
* @see @fn_gl{GetObjectLabel} or * @see @fn_gl{GetObjectLabel} or
* @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{TEXTURE} * @def_gl{TEXTURE}
@ -298,8 +299,9 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If OpenGL 4.3 is not supported and neither * 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{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function does nothing. * nor @extension2{EXT,debug_label} desktop or ES extension is
* available, this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or
* @fn_gl_extension2{LabelObject,EXT,debug_label} with * @fn_gl_extension2{LabelObject,EXT,debug_label} with
* @def_gl{TEXTURE} * @def_gl{TEXTURE}

10
src/Magnum/Buffer.h
Unescape View File

@ -913,8 +913,9 @@ class MAGNUM_EXPORT Buffer: public AbstractObject {
* *
* The result is *not* cached, repeated queries will result in repeated * The result is *not* cached, repeated queries will result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and neither * OpenGL calls. If OpenGL 4.3 is not supported and neither
* @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function returns empty string. * 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 * @see @fn_gl{GetObjectLabel} with @def_gl{BUFFER} or
* @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{BUFFER_OBJECT_EXT} * @def_gl{BUFFER_OBJECT_EXT}
@ -927,8 +928,9 @@ class MAGNUM_EXPORT Buffer: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If OpenGL 4.3 is not supported and neither * 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{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function does nothing. * 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} * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with @def_gl{BUFFER}
* or @fn_gl_extension2{LabelObject,EXT,debug_label} with * or @fn_gl_extension2{LabelObject,EXT,debug_label} with
* @def_gl{BUFFER_OBJECT_EXT} * @def_gl{BUFFER_OBJECT_EXT}

5
src/Magnum/Context.h
Unescape View File

@ -108,8 +108,9 @@ class MAGNUM_EXPORT Context {
enum class Flag: GLint { enum class Flag: GLint {
/** /**
* Debug context * Debug context
* @requires_gl43 Extension @es_extension{KHR,debug} * @requires_gl43 Extension @extension{KHR,debug}
* @requires_es_extension Extension @es_extension{KHR,debug} * @requires_es_extension Extension @es_extension{ANDROID,extension_pack_es31a}/
* @es_extension2{KHR,debug,debug}
*/ */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
Debug = GL_CONTEXT_FLAG_DEBUG_BIT, Debug = GL_CONTEXT_FLAG_DEBUG_BIT,

48
src/Magnum/DebugOutput.h
Unescape View File

@ -59,9 +59,10 @@ stream in various graphics debuggers, such as Apitrace or gDEBugger.
## Basic usage ## Basic usage
Support for debug output is provided by OpenGL 4.3 or @extension{KHR,debug} 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 (desktop/ES extension, covered also by @es_extension{ANDROID,extension_pack_es31a}).
@extension2{EXT,debug_marker} (desktop/ES extensions) or Subset of the functionality is provided also by @extension2{EXT,debug_marker}
@extension{GREMEDY,string_marker} (desktop only extension). (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 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 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 * The result is cached, repeated queries don't result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and @extension{KHR,debug} * 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} * @see @fn_gl{Get} with @def_gl{MAX_DEBUG_LOGGED_MESSAGES}
*/ */
static Int maxLoggedMessages(); static Int maxLoggedMessages();
@ -310,7 +312,8 @@ class MAGNUM_EXPORT DebugOutput {
* *
* The result is cached, repeated queries don't result in repeated * The result is cached, repeated queries don't result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and @extension{KHR,debug} * 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} * @see @fn_gl{Get} with @def_gl{MAX_DEBUG_MESSAGE_LENGTH}
*/ */
static Int maxMessageLength(); static Int maxMessageLength();
@ -325,7 +328,8 @@ class MAGNUM_EXPORT DebugOutput {
* for more information. * for more information.
* *
* If OpenGL 4.3 is not supported and @extension{KHR,debug} desktop or * 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} * @see @ref Renderer::Feature::DebugOutput, @fn_gl{DebugMessageControl}
*/ */
static void setEnabled(Source source, Type type, std::initializer_list<UnsignedInt> ids, bool enabled) { static void setEnabled(Source source, Type type, std::initializer_list<UnsignedInt> ids, bool enabled) {
@ -377,7 +381,8 @@ class MAGNUM_EXPORT DebugOutput {
* *
* The messages are sent to the callback only if * The messages are sent to the callback only if
* @ref Renderer::Feature::DebugOutput is enabled. If OpenGL 4.3 is not * @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. * available, this function does nothing.
* @see @ref setDefaultCallback(), * @see @ref setDefaultCallback(),
* @ref Renderer::Feature::DebugOutputSynchronous, * @ref Renderer::Feature::DebugOutputSynchronous,
@ -432,10 +437,10 @@ gDEBugger.
See @ref DebugOutput for introduction. See @ref DebugOutput for introduction.
If OpenGL 4.3 is supported or @extension{KHR,debug} desktop or ES extension is If OpenGL 4.3 is supported or @extension{KHR,debug} desktop or ES extension
available and default debug output callback is enabled for given kind of (covered also by @es_extension{ANDROID,extension_pack_es31a}) is available and
messages, the inserted message will be printed on standard output in the default debug output callback is enabled for given kind of messages, the
following form: inserted message will be printed on standard output in the following form:
@code @code
DebugMessage::insert(DebugMessage::Source::Application, DebugMessage::Type::Marker, DebugMessage::insert(DebugMessage::Source::Application, DebugMessage::Type::Marker,
@ -650,7 +655,8 @@ class MAGNUM_EXPORT DebugMessage {
* @param severity Message severity * @param severity Message severity
* @param string The actual message * @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 * @extension2{EXT,debug_marker} (desktop or ES extensions) nor
* @extension{GREMEDY,string_marker} (desktop only extension) are * @extension{GREMEDY,string_marker} (desktop only extension) are
* available, this function does nothing. * available, this function does nothing.
@ -729,10 +735,11 @@ Renderer::disable(Renderer::Feature::Blending);
group.pop(); group.pop();
@endcode @endcode
If OpenGL 4.3 is supported or @extension{KHR,debug} desktop or ES extension is If OpenGL 4.3 is supported or @extension{KHR,debug} desktop or ES extension
available and the default debug output callback is enabled for these kinds of (covered also by @es_extension{ANDROID,extension_pack_es31a}) is available and
messages, the group entering and leaving will be printed on standard output in the default debug output callback is enabled for these kinds of messages, the
the following form: 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 enter (42): Scene rendering\n
> Debug output: application debug group leave (42): Scene rendering > 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 * The result is cached, repeated queries don't result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and @extension{KHR,debug} * 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} * @see @fn_gl{Get} with @def_gl{MAX_DEBUG_GROUP_STACK_DEPTH}
*/ */
static Int maxStackDepth(); static Int maxStackDepth();
@ -842,7 +850,8 @@ class MAGNUM_EXPORT DebugGroup {
* @ref DebugOutput::Type::PushGroup and * @ref DebugOutput::Type::PushGroup and
* @ref DebugOutput::Severity::Notification. * @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 * @extension2{EXT,debug_marker} is available, this function does
* nothing. If @extension{KHR,debug} is not available and only * nothing. If @extension{KHR,debug} is not available and only
* @extension2{EXT,debug_marker} is available, only @p message is used * @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::Type::PopGroup and
* @ref DebugOutput::Severity::Notification. * @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 * @extension2{EXT,debug_marker} is available, this function does
* nothing. * nothing.
* @see @ref push(), @ref Renderer::Error::StackUnderflow, * @see @ref push(), @ref Renderer::Error::StackUnderflow,

10
src/Magnum/Framebuffer.h
Unescape View File

@ -394,8 +394,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje
* *
* The result is *not* cached, repeated queries will result in repeated * The result is *not* cached, repeated queries will result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and neither * OpenGL calls. If OpenGL 4.3 is not supported and neither
* @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function returns empty string. * nor @extension2{EXT,debug_label} desktop or ES extension is
* available, this function returns empty string.
* @see @fn_gl{GetObjectLabel} or * @see @fn_gl{GetObjectLabel} or
* @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{FRAMEBUFFER} * @def_gl{FRAMEBUFFER}
@ -408,8 +409,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If OpenGL 4.3 is not supported and neither * 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{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function does nothing. * nor @extension2{EXT,debug_label} desktop or ES extension is
* available, this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or
* @fn_gl_extension2{LabelObject,EXT,debug_label} with * @fn_gl_extension2{LabelObject,EXT,debug_label} with
* @def_gl{FRAMEBUFFER} * @def_gl{FRAMEBUFFER}

10
src/Magnum/Mesh.h
Unescape View File

@ -532,8 +532,9 @@ class MAGNUM_EXPORT Mesh: public AbstractObject {
* *
* The result is *not* cached, repeated queries will result in repeated * The result is *not* cached, repeated queries will result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and neither * OpenGL calls. If OpenGL 4.3 is not supported and neither
* @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function returns empty string. * 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 * @see @fn_gl{GetObjectLabel} with @def_gl{VERTEX_ARRAY} or
* @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{VERTEX_ARRAY_OBJECT_EXT} * @def_gl{VERTEX_ARRAY_OBJECT_EXT}
@ -546,8 +547,9 @@ class MAGNUM_EXPORT Mesh: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If OpenGL 4.3 is not supported and neither * 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{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function does nothing. * nor @extension2{EXT,debug_label} desktop or ES extension is
* available, this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with
* @def_gl{VERTEX_ARRAY} or @fn_gl_extension2{LabelObject,EXT,debug_label} * @def_gl{VERTEX_ARRAY} or @fn_gl_extension2{LabelObject,EXT,debug_label}
* with @def_gl{VERTEX_ARRAY_OBJECT_EXT} * with @def_gl{VERTEX_ARRAY_OBJECT_EXT}

10
src/Magnum/Renderbuffer.h
Unescape View File

@ -164,8 +164,9 @@ class MAGNUM_EXPORT Renderbuffer: public AbstractObject {
* *
* The result is *not* cached, repeated queries will result in repeated * The result is *not* cached, repeated queries will result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and neither * OpenGL calls. If OpenGL 4.3 is not supported and neither
* @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function returns empty string. * nor @extension2{EXT,debug_label} desktop or ES extension is
* available, this function returns empty string.
* @see @fn_gl{GetObjectLabel} or * @see @fn_gl{GetObjectLabel} or
* @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{RENDERBUFFER} * @def_gl{RENDERBUFFER}
@ -178,8 +179,9 @@ class MAGNUM_EXPORT Renderbuffer: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If OpenGL 4.3 is not supported and neither * 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{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function does nothing. * nor @extension2{EXT,debug_label} desktop or ES extension is
* available, this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or
* @fn_gl_extension2{LabelObject,EXT,debug_label} with * @fn_gl_extension2{LabelObject,EXT,debug_label} with
* @def_gl{RENDERBUFFER} * @def_gl{RENDERBUFFER}

12
src/Magnum/Renderer.h
Unescape View File

@ -91,7 +91,8 @@ class MAGNUM_EXPORT Renderer {
* @see @ref DebugOutput, @ref Feature::DebugOutputSynchronous, * @see @ref DebugOutput, @ref Feature::DebugOutputSynchronous,
* @ref Platform::Sdl2Application::Configuration::Flag::Debug "Platform::*Application::Configuration::Flag::Debug" * @ref Platform::Sdl2Application::Configuration::Flag::Debug "Platform::*Application::Configuration::Flag::Debug"
* @requires_gl43 Extension @extension{KHR,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. * @requires_gles Debug output is not available in WebGL.
*/ */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
@ -105,7 +106,8 @@ class MAGNUM_EXPORT Renderer {
* @ref Feature::DebugOutput is enabled. * @ref Feature::DebugOutput is enabled.
* @see @ref DebugMessage * @see @ref DebugMessage
* @requires_gl43 Extension @extension{KHR,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. * @requires_gles Debug output is not available in WebGL.
*/ */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
@ -1032,7 +1034,8 @@ class MAGNUM_EXPORT Renderer {
* Given operation would cause an internal stack to underflow. * Given operation would cause an internal stack to underflow.
* @see @ref DebugGroup * @see @ref DebugGroup
* @requires_gl43 Extension @extension{KHR,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. * @requires_gles Debug output is not available in WebGL.
*/ */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
@ -1045,7 +1048,8 @@ class MAGNUM_EXPORT Renderer {
* Given operation would cause an internal stack to overflow. * Given operation would cause an internal stack to overflow.
* @see @ref DebugGroup * @see @ref DebugGroup
* @requires_gl43 Extension @extension{KHR,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. * @requires_gles Debug output is not available in WebGL.
*/ */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES

10
src/Magnum/Shader.h
Unescape View File

@ -517,8 +517,9 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
* *
* The result is *not* cached, repeated queries will result in repeated * The result is *not* cached, repeated queries will result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and neither * OpenGL calls. If OpenGL 4.3 is not supported and neither
* @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function returns empty string. * 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 * @see @fn_gl{GetObjectLabel} with @def_gl{SHADER} or
* @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{SHADER_OBJECT_EXT} * @def_gl{SHADER_OBJECT_EXT}
@ -531,8 +532,9 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If OpenGL 4.3 is not supported and neither * 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{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function does nothing. * nor @extension2{EXT,debug_label} desktop or ES extension is
* available, this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with
* @def_gl{SHADER} or @fn_gl_extension2{LabelObject,EXT,debug_label} * @def_gl{SHADER} or @fn_gl_extension2{LabelObject,EXT,debug_label}
* with @def_gl{SHADER_OBJECT_EXT} * with @def_gl{SHADER_OBJECT_EXT}

10
src/Magnum/TransformFeedback.h
Unescape View File

@ -224,8 +224,9 @@ class MAGNUM_EXPORT TransformFeedback: public AbstractObject {
* *
* The result is *not* cached, repeated queries will result in repeated * The result is *not* cached, repeated queries will result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and neither * OpenGL calls. If OpenGL 4.3 is not supported and neither
* @extension{KHR,debug} nor @extension2{EXT,debug_label} desktop or ES * @extension{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function returns empty string. * 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} * @see @fn_gl{GetObjectLabel} or @fn_gl_extension2{GetObjectLabel,EXT,debug_label}
* with @def_gl{TRANSFORM_FEEDBACK} * with @def_gl{TRANSFORM_FEEDBACK}
* @requires_gles Debug output is not available in WebGL. * @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) * @return Reference to self (for method chaining)
* *
* Default is empty string. If OpenGL 4.3 is not supported and neither * 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{KHR,debug} (covered also by @es_extension{ANDROID,extension_pack_es31a})
* extension is available, this function does nothing. * nor @extension2{EXT,debug_label} desktop or ES extension is
* available, this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or
* @fn_gl_extension2{LabelObject,EXT,debug_label} with * @fn_gl_extension2{LabelObject,EXT,debug_label} with
* @def_gl{TRANSFORM_FEEDBACK} * @def_gl{TRANSFORM_FEEDBACK}

Write Preview
Loading…
Cancel
Save