Browse Source

Removed long-deprecated Mesh::maxVertexAttributes().

Use AbstractShaderProgram::maxVertexAttributes() instead.
pull/231/head
Vladimír Vondruš 8 years ago
parent
commit
d4eb0118df
  1. 3
      src/Magnum/AbstractShaderProgram.h
  2. 4
      src/Magnum/Mesh.cpp
  3. 12
      src/Magnum/Mesh.h

3
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 * The result is cached, repeated queries don't result in repeated
* OpenGL calls. * OpenGL calls.
* @see @ref Mesh::maxVertexAttributes(), * @see @ref Attribute, @fn_gl{Get} with @def_gl_keyword{MAX_VERTEX_ATTRIBS}
* @ref Attribute, @fn_gl{Get} with @def_gl_keyword{MAX_VERTEX_ATTRIBS}
*/ */
static Int maxVertexAttributes(); static Int maxVertexAttributes();

4
src/Magnum/Mesh.cpp

@ -59,10 +59,6 @@ struct Mesh::AttributeLayout {
GLuint divisor; GLuint divisor;
}; };
#ifdef MAGNUM_BUILD_DEPRECATED
Int Mesh::maxVertexAttributes() { return AbstractShaderProgram::maxVertexAttributes(); }
#endif
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
Long Mesh::maxElementIndex() Long Mesh::maxElementIndex()

12
src/Magnum/Mesh.h

@ -37,10 +37,6 @@
#include "Magnum/Attribute.h" #include "Magnum/Attribute.h"
#include "Magnum/Tags.h" #include "Magnum/Tags.h"
#ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h>
#endif
namespace Magnum { namespace Magnum {
/** /**
@ -384,14 +380,6 @@ class MAGNUM_EXPORT Mesh: public AbstractObject {
UnsignedInt = GL_UNSIGNED_INT 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 #ifndef MAGNUM_TARGET_GLES2
/** /**
* @brief Max supported index value * @brief Max supported index value

Loading…
Cancel
Save