diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h index 05e10e139..474e351a1 100644 --- a/src/Magnum/AbstractShaderProgram.h +++ b/src/Magnum/AbstractShaderProgram.h @@ -536,8 +536,7 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject { * * The result is cached, repeated queries don't result in repeated * OpenGL calls. - * @see @ref Mesh::maxVertexAttributes(), - * @ref Attribute, @fn_gl{Get} with @def_gl_keyword{MAX_VERTEX_ATTRIBS} + * @see @ref Attribute, @fn_gl{Get} with @def_gl_keyword{MAX_VERTEX_ATTRIBS} */ static Int maxVertexAttributes(); diff --git a/src/Magnum/Mesh.cpp b/src/Magnum/Mesh.cpp index 5d7ebc32c..a38c2d104 100644 --- a/src/Magnum/Mesh.cpp +++ b/src/Magnum/Mesh.cpp @@ -59,10 +59,6 @@ struct Mesh::AttributeLayout { GLuint divisor; }; -#ifdef MAGNUM_BUILD_DEPRECATED -Int Mesh::maxVertexAttributes() { return AbstractShaderProgram::maxVertexAttributes(); } -#endif - #ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_WEBGL Long Mesh::maxElementIndex() diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h index bf4f833d3..a705121a5 100644 --- a/src/Magnum/Mesh.h +++ b/src/Magnum/Mesh.h @@ -37,10 +37,6 @@ #include "Magnum/Attribute.h" #include "Magnum/Tags.h" -#ifdef MAGNUM_BUILD_DEPRECATED -#include -#endif - namespace Magnum { /** @@ -384,14 +380,6 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { UnsignedInt = GL_UNSIGNED_INT }; - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief @copybrief AbstractShaderProgram::maxVertexAttributes() - * @deprecated Use @ref AbstractShaderProgram::maxVertexAttributes() instead. - */ - CORRADE_DEPRECATED("use AbstractShaderProgram::maxVertexAttributes() instead") static Int maxVertexAttributes(); - #endif - #ifndef MAGNUM_TARGET_GLES2 /** * @brief Max supported index value