diff --git a/src/Magnum/CubeMapTexture.h b/src/Magnum/CubeMapTexture.h index 7042d63c4..2e686db9c 100644 --- a/src/Magnum/CubeMapTexture.h +++ b/src/Magnum/CubeMapTexture.h @@ -413,7 +413,7 @@ class MAGNUM_EXPORT CubeMapTexture: public AbstractTexture { * @requires_extension Extension @extension{EXT,texture_sRGB_decode} * @requires_es_extension OpenGL ES 3.0 or extension * @extension{EXT,sRGB} and - * @extension{ANDROID,extension_pack_es31a}/ + * @extension{ANDROID,extension_pack_es31a} / * @extension2{EXT,texture_sRGB_decode,texture_sRGB_decode} * @requires_gles SRGB decode is not available in WebGL. */ diff --git a/src/Magnum/CubeMapTextureArray.h b/src/Magnum/CubeMapTextureArray.h index f5015114a..97c0bc59b 100644 --- a/src/Magnum/CubeMapTextureArray.h +++ b/src/Magnum/CubeMapTextureArray.h @@ -364,7 +364,7 @@ class MAGNUM_EXPORT CubeMapTextureArray: public AbstractTexture { * * See @ref Texture::setSRGBDecode() for more information. * @requires_extension Extension @extension{EXT,texture_sRGB_decode} - * @requires_es_extension Extension @extension{ANDROID,extension_pack_es31a}/ + * @requires_es_extension Extension @extension{ANDROID,extension_pack_es31a} / * @extension2{EXT,texture_sRGB_decode,texture_sRGB_decode} */ CubeMapTextureArray& setSRGBDecode(bool decode) { diff --git a/src/Magnum/DebugOutput.h b/src/Magnum/DebugOutput.h index 1d3523dfa..80e9bbff7 100644 --- a/src/Magnum/DebugOutput.h +++ b/src/Magnum/DebugOutput.h @@ -495,23 +495,17 @@ class MAGNUM_EXPORT DebugMessage { * @brief Message source * * @see @ref insert() - * @todoc use m_enum_values_as_keywords once deprecated values are gone + * @m_enum_values_as_keywords */ enum class Source: GLenum { - /** - * External debugger or third-party middleware - * @m_keywords{GL_DEBUG_SOURCE_THIRD_PARTY} - */ + /** External debugger or third-party middleware */ #ifndef MAGNUM_TARGET_GLES2 ThirdParty = GL_DEBUG_SOURCE_THIRD_PARTY, #else ThirdParty = GL_DEBUG_SOURCE_THIRD_PARTY_KHR, #endif - /** - * The application - * @m_keywords{GL_DEBUG_SOURCE_APPLICATION} - */ + /** The application */ #ifndef MAGNUM_TARGET_GLES2 Application = GL_DEBUG_SOURCE_APPLICATION #else diff --git a/src/Magnum/Sampler.h b/src/Magnum/Sampler.h index a09bd2a12..852bf7743 100644 --- a/src/Magnum/Sampler.h +++ b/src/Magnum/Sampler.h @@ -78,7 +78,11 @@ class MAGNUM_EXPORT Sampler { * @see @ref Texture::setMinificationFilter() "*Texture::setMinificationFilter()" */ enum class Mipmap: GLint { - Base = GL_NEAREST & ~GL_NEAREST, /**< Select base mip level */ + /** + * Select base mip level + * @m_keywords{GL_NEAREST} + */ + Base = GL_NEAREST & ~GL_NEAREST, /** * Select nearest mip level. **Unavailable on rectangle textures.** diff --git a/src/Magnum/Texture.h b/src/Magnum/Texture.h index 4cc222bef..dd8e7abf1 100644 --- a/src/Magnum/Texture.h +++ b/src/Magnum/Texture.h @@ -575,7 +575,7 @@ template class Texture: public AbstractTexture { * @requires_extension Extension @extension{EXT,texture_sRGB_decode} * @requires_es_extension OpenGL ES 3.0 or extension * @extension{EXT,sRGB} and - * @extension{ANDROID,extension_pack_es31a}/ + * @extension{ANDROID,extension_pack_es31a} / * @extension2{EXT,texture_sRGB_decode,texture_sRGB_decode} * @requires_gles SRGB decode is not available in WebGL. */ diff --git a/src/Magnum/TextureArray.h b/src/Magnum/TextureArray.h index 03927715d..ba8b2aeea 100644 --- a/src/Magnum/TextureArray.h +++ b/src/Magnum/TextureArray.h @@ -387,7 +387,7 @@ template class TextureArray: public AbstractTexture { * * See @ref Texture::setSRGBDecode() for more information. * @requires_extension Extension @extension{EXT,texture_sRGB_decode} - * @requires_es_extension Extension @extension{ANDROID,extension_pack_es31a}/ + * @requires_es_extension Extension @extension{ANDROID,extension_pack_es31a} / * @extension2{EXT,texture_sRGB_decode,texture_sRGB_decode} * @requires_gles SRGB decode is not available in WebGL. */ diff --git a/src/Magnum/TextureFormat.h b/src/Magnum/TextureFormat.h index d7bf8cd41..79e6604a8 100644 --- a/src/Magnum/TextureFormat.h +++ b/src/Magnum/TextureFormat.h @@ -125,6 +125,8 @@ enum class TextureFormat: GLenum { * RGB, normalized unsigned, size implementation-dependent. Not allowed in * unemulated @ref Texture::setStorage() "*Texture::setStorage()" calls, in * that case use @ref TextureFormat::RGB8 "TextureFormat::RGB8" instead. + * @requires_gl Can't be used as a render target in OpenGL ES or WebGL. See + * @ref TextureFormat::RGBA for an alternative. * @deprecated_gl Prefer to use the exactly specified version of this * format, e.g. @ref TextureFormat::RGB8. */