diff --git a/src/Magnum/AbstractObject.h b/src/Magnum/AbstractObject.h index d18a119e5..54a220673 100644 --- a/src/Magnum/AbstractObject.h +++ b/src/Magnum/AbstractObject.h @@ -50,9 +50,9 @@ class MAGNUM_EXPORT AbstractObject { * @brief Max object label length * * The result is cached, repeated queries don't result in repeated - * OpenGL calls. If @extension{KHR,debug} desktop or ES extension is - * not available, returns `0`. Note that @extension2{EXT,debug_label} - * has no such limit. + * 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. * @see @ref AbstractQuery::setLabel(), @ref AbstractShaderProgram::setLabel(), * @ref AbstractTexture::setLabel(), @ref Buffer::setLabel(), * @ref BufferTexture::setLabel(), @ref Framebuffer::setLabel(), diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h index c4473629e..7186b692e 100644 --- a/src/Magnum/AbstractShaderProgram.h +++ b/src/Magnum/AbstractShaderProgram.h @@ -517,9 +517,9 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { * @brief %Shader program label * * The result is *not* cached, repeated queries will result in repeated - * OpenGL calls. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function returns empty string. + * 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. * @see @fn_gl{GetObjectLabel} with @def_gl{PROGRAM} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{PROGRAM_OBJECT_EXT} @@ -530,9 +530,9 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { * @brief Set shader program label * @return Reference to self (for method chaining) * - * Default is empty string. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function does nothing. + * 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. * @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 8a10eede1..5e41dc1d3 100644 --- a/src/Magnum/AbstractTexture.h +++ b/src/Magnum/AbstractTexture.h @@ -83,8 +83,8 @@ You can use functions @ref Texture::invalidateImage() and @ref Texture::invalidateSubImage() "invalidateSubImage()" if you don't need texture data anymore to avoid unnecessary memory operations performed by OpenGL in order to preserve the data. If running on OpenGL ES or extension -@extension{ARB,invalidate_subdata} is not available, these functions do -nothing. +@extension{ARB,invalidate_subdata} (part of OpenGL 4.3) is not available, these +functions do nothing. @todo all texture [level] parameters, global texture parameters @todo Add glPixelStore encapsulation @@ -180,9 +180,9 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { * @brief %Texture label * * The result is *not* cached, repeated queries will result in repeated - * OpenGL calls. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function returns empty string. + * 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. * @see @fn_gl{GetObjectLabel} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{TEXTURE} @@ -193,9 +193,9 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { * @brief Set texture label * @return Reference to self (for method chaining) * - * Default is empty string. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function does nothing. + * 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. * @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 faed9eae9..35d5d1e5d 100644 --- a/src/Magnum/Buffer.h +++ b/src/Magnum/Buffer.h @@ -185,8 +185,8 @@ and @ref unmap() use DSA functions to avoid unnecessary calls to You can use functions @ref invalidateData() and @ref invalidateSubData() if you don't need buffer data anymore to avoid unnecessary memory operations performed by OpenGL in order to preserve the data. If running on OpenGL ES or extension -@extension{ARB,invalidate_subdata} is not available, these functions do -nothing. +@extension{ARB,invalidate_subdata} (part of OpenGL 4.3) is not available, these +functions do nothing. */ class MAGNUM_EXPORT Buffer: public AbstractObject { friend struct Implementation::BufferState; @@ -544,9 +544,9 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { * @brief %Buffer label * * The result is *not* cached, repeated queries will result in repeated - * OpenGL calls. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function returns empty string. + * 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. * @see @fn_gl{GetObjectLabel} with @def_gl{BUFFER} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{BUFFER_OBJECT_EXT} @@ -557,9 +557,9 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { * @brief Set buffer label * @return Reference to self (for method chaining) * - * Default is empty string. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function does nothing. + * 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. * @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/Framebuffer.h b/src/Magnum/Framebuffer.h index 7076898ba..7d6f27091 100644 --- a/src/Magnum/Framebuffer.h +++ b/src/Magnum/Framebuffer.h @@ -333,9 +333,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * @brief %Framebuffer label * * The result is *not* cached, repeated queries will result in repeated - * OpenGL calls. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function returns empty string. + * 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. * @see @fn_gl{GetObjectLabel} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{FRAMEBUFFER} @@ -346,9 +346,9 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * @brief Set framebuffer label * @return Reference to self (for method chaining) * - * Default is empty string. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function does nothing. + * 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. * @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 0d65c4151..243efe699 100644 --- a/src/Magnum/Mesh.h +++ b/src/Magnum/Mesh.h @@ -426,9 +426,9 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { * @brief %Mesh label * * The result is *not* cached, repeated queries will result in repeated - * OpenGL calls. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function returns empty string. + * 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. * @see @fn_gl{GetObjectLabel} with @def_gl{VERTEX_ARRAY} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{VERTEX_ARRAY_OBJECT_EXT} @@ -439,9 +439,9 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { * @brief Set mesh label * @return Reference to self (for method chaining) * - * Default is empty string. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function does nothing. + * 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. * @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/Query.h b/src/Magnum/Query.h index 4062c0513..3a55772f3 100644 --- a/src/Magnum/Query.h +++ b/src/Magnum/Query.h @@ -64,9 +64,9 @@ class MAGNUM_EXPORT AbstractQuery: public AbstractObject { * @brief %Query label * * The result is *not* cached, repeated queries will result in repeated - * OpenGL calls. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function returns empty string. + * 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. * @see @fn_gl{GetObjectLabel} with @def_gl{QUERY} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{QUERY_OBJECT_EXT} @@ -77,9 +77,9 @@ class MAGNUM_EXPORT AbstractQuery: public AbstractObject { * @brief Set query label * @return Reference to self (for method chaining) * - * Default is empty string. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function does nothing. + * 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. * @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/RectangleTexture.h b/src/Magnum/RectangleTexture.h index d226bc9c8..d31f4d02f 100644 --- a/src/Magnum/RectangleTexture.h +++ b/src/Magnum/RectangleTexture.h @@ -166,10 +166,10 @@ class RectangleTexture: public AbstractTexture { * allowed. * * If @extension{EXT,direct_state_access} is not available, the texture - * is bound to some layer before the operation. If OpenGL 4.2, - * @extension{ARB,texture_storage}, OpenGL ES 3.0 or - * @es_extension{EXT,texture_storage} in OpenGL ES 2.0 is not - * available, the feature is emulated with @ref setImage() call. + * is bound to some layer before the operation. If @extension{ARB,texture_storage} + * (part of OpenGL 4.2), OpenGL ES 3.0 or @es_extension{EXT,texture_storage} + * in OpenGL ES 2.0 is not available, the feature is emulated with + * @ref setImage() call. * @see @fn_gl{ActiveTexture}, @fn_gl{BindTexture} and @fn_gl{TexStorage2D} * or @fn_gl_extension{TextureStorage2D,EXT,direct_state_access}, * eventually @fn_gl{TexImage2D} or diff --git a/src/Magnum/Renderbuffer.h b/src/Magnum/Renderbuffer.h index 07ad9fb97..febb72670 100644 --- a/src/Magnum/Renderbuffer.h +++ b/src/Magnum/Renderbuffer.h @@ -115,9 +115,9 @@ class MAGNUM_EXPORT Renderbuffer: public AbstractObject { * @brief %Renderbuffer label * * The result is *not* cached, repeated queries will result in repeated - * OpenGL calls. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function returns empty string. + * 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. * @see @fn_gl{GetObjectLabel} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{RENDERBUFFER} @@ -128,9 +128,9 @@ class MAGNUM_EXPORT Renderbuffer: public AbstractObject { * @brief Set renderbuffer label * @return Reference to self (for method chaining) * - * Default is empty string. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function does nothing. + * 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. * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or * @fn_gl_extension2{LabelObject,EXT,debug_label} with * @def_gl{RENDERBUFFER} diff --git a/src/Magnum/Shader.h b/src/Magnum/Shader.h index 902b0f8fc..e7768948a 100644 --- a/src/Magnum/Shader.h +++ b/src/Magnum/Shader.h @@ -471,9 +471,9 @@ class MAGNUM_EXPORT Shader: public AbstractObject { * @brief %Shader label * * The result is *not* cached, repeated queries will result in repeated - * OpenGL calls. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function returns empty string. + * 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. * @see @fn_gl{GetObjectLabel} with @def_gl{SHADER} or * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with * @def_gl{SHADER_OBJECT_EXT} @@ -484,9 +484,9 @@ class MAGNUM_EXPORT Shader: public AbstractObject { * @brief Set shader label * @return Reference to self (for method chaining) * - * Default is empty string. If neither @extension{KHR,debug} nor - * @extension2{EXT,debug_label} desktop or ES extension is available, - * this function does nothing. + * 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. * @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/Texture.h b/src/Magnum/Texture.h index b7fc72b68..e4e5d8169 100644 --- a/src/Magnum/Texture.h +++ b/src/Magnum/Texture.h @@ -296,11 +296,10 @@ template class Texture: public AbstractTexture { * allowed. * * If @extension{EXT,direct_state_access} is not available, the texture - * is bound to some layer before the operation. If OpenGL 4.2, - * @extension{ARB,texture_storage}, OpenGL ES 3.0 or - * @es_extension{EXT,texture_storage} in OpenGL ES 2.0 is not - * available, the feature is emulated with sequence of @ref setImage() - * calls. + * is bound to some layer before the operation. If @extension{ARB,texture_storage} + * (part of OpenGL 4.2), OpenGL ES 3.0 or @es_extension{EXT,texture_storage} + * in OpenGL ES 2.0 is not available, the feature is emulated with + * sequence of @ref setImage() calls. * @see @fn_gl{ActiveTexture}, @fn_gl{BindTexture} and * @fn_gl{TexStorage1D}/@fn_gl{TexStorage2D}/@fn_gl{TexStorage3D} * or @fn_gl_extension{TextureStorage1D,EXT,direct_state_access}/