From 67bcb6f3473ff6d72e76fa6a86e88deb5494d093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 21 Oct 2018 12:17:41 +0200 Subject: [PATCH] Properly mark MeshPrimitive members as deprecated. Something weird happened when I was writing this file. --- doc/changelog.dox | 2 ++ src/Magnum/Mesh.h | 34 +++++++++------------------------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 72bf29640..8ff314ad0 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -440,6 +440,8 @@ See also: [mosra/magnum#261](https://github.com/mosra/magnum/issues/261)) - Documentation of @ref Primitives and @ref Shaders namespaces now has proper sRGB and HiDPi renderings of all primitives and shaders +- Deprecation status of GL-specific values of the generic @ref MeshPrimitive + enum was not properly reflected in the documentation @subsection changelog-latest-deprecated Deprecated APIs diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h index 4aeeeab81..edbc53723 100644 --- a/src/Magnum/Mesh.h +++ b/src/Magnum/Mesh.h @@ -104,47 +104,31 @@ enum class MeshPrimitive: UnsignedInt { #if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL) && !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) /** * Lines with adjacency information. - * @requires_gl32 Extension @gl_extension{ARB,geometry_shader4} - * @requires_gles30 Not defined in OpenGL ES 2.0. - * @requires_gles32 Extension @gl_extension{ANDROID,extension_pack_es31a} / - * @gl_extension{EXT,geometry_shader} - * @requires_gles Geometry shaders are not available in WebGL. + * @deprecated Use @ref GL::MeshPrimitive::LinesAdjacency instead. */ - LinesAdjacency CORRADE_DEPRECATED_ENUM("use GL::MeshPrimitive::Patches instead") = UnsignedInt(GL::MeshPrimitive::LinesAdjacency), + LinesAdjacency CORRADE_DEPRECATED_ENUM("use GL::MeshPrimitive::LinesAdjacency instead") = UnsignedInt(GL::MeshPrimitive::LinesAdjacency), /** * Line strip with adjacency information. - * @requires_gl32 Extension @gl_extension{ARB,geometry_shader4} - * @requires_gles30 Not defined in OpenGL ES 2.0. - * @requires_gles32 Extension @gl_extension{ANDROID,extension_pack_es31a} / - * @gl_extension{EXT,geometry_shader} - * @requires_gles Geometry shaders are not available in WebGL. + * @deprecated Use @ref GL::MeshPrimitive::LineStripAdjacency instead. */ - LineStripAdjacency CORRADE_DEPRECATED_ENUM("use GL::MeshPrimitive::Patches instead") = UnsignedInt(GL::MeshPrimitive::LineStripAdjacency), + LineStripAdjacency CORRADE_DEPRECATED_ENUM("use GL::MeshPrimitive::LineStripAdjacency instead") = UnsignedInt(GL::MeshPrimitive::LineStripAdjacency), /** * Triangles with adjacency information. - * @requires_gl32 Extension @gl_extension{ARB,geometry_shader4} - * @requires_gles30 Not defined in OpenGL ES 2.0. - * @requires_gles32 Extension @gl_extension{ANDROID,extension_pack_es31a} / - * @gl_extension{EXT,geometry_shader} - * @requires_gles Geometry shaders are not available in WebGL. + * @deprecated Use @ref GL::MeshPrimitive::TrianglesAdjacency instead. */ - TrianglesAdjacency CORRADE_DEPRECATED_ENUM("use GL::MeshPrimitive::Patches instead") = UnsignedInt(GL::MeshPrimitive::TrianglesAdjacency), + TrianglesAdjacency CORRADE_DEPRECATED_ENUM("use GL::MeshPrimitive::TrianglesAdjacency instead") = UnsignedInt(GL::MeshPrimitive::TrianglesAdjacency), /** * Triangle strip with adjacency information. - * @requires_gl32 Extension @gl_extension{ARB,geometry_shader4} - * @requires_gles30 Not defined in OpenGL ES 2.0. - * @requires_gles32 Extension @gl_extension{ANDROID,extension_pack_es31a} / - * @gl_extension{EXT,geometry_shader} - * @requires_gles Geometry shaders are not available in WebGL. + * @deprecated Use @ref GL::MeshPrimitive::TriangleStripAdjacency instead. */ - TriangleStripAdjacency CORRADE_DEPRECATED_ENUM("use GL::MeshPrimitive::Patches instead") = UnsignedInt(GL::MeshPrimitive::TriangleStripAdjacency), + TriangleStripAdjacency CORRADE_DEPRECATED_ENUM("use GL::MeshPrimitive::TriangleStripAdjacency instead") = UnsignedInt(GL::MeshPrimitive::TriangleStripAdjacency), /** * Patches. - * @deprecated Use @ref GL::MeshPrimitive::Patches instead + * @deprecated Use @ref GL::MeshPrimitive::Patches instead. */ Patches CORRADE_DEPRECATED_ENUM("use GL::MeshPrimitive::Patches instead") = UnsignedInt(GL::MeshPrimitive::Patches) #endif