Browse Source

Removed deprecated parameter-less *Mesh::draw() overload.

Use the one with explicit shader parameter instead.
pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
7fc34f9791
  1. 16
      src/Magnum/Mesh.h
  2. 12
      src/Magnum/MeshView.cpp
  3. 12
      src/Magnum/MeshView.h

16
src/Magnum/Mesh.h

@ -841,22 +841,6 @@ class MAGNUM_EXPORT Mesh: public AbstractObject {
void draw(AbstractShaderProgram&& shader) { draw(shader); } /**< @overload */
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @copybrief draw(AbstractShaderProgram&)
* @deprecated Use @ref draw(AbstractShaderProgram&) instead.
*/
CORRADE_DEPRECATED("use draw(AbstractShaderProgram&) instead") void draw() {
#ifndef MAGNUM_TARGET_GLES
drawInternal(_count, _baseVertex, _instanceCount, _baseInstance, _indexOffset, _indexStart, _indexEnd);
#elif !defined(MAGNUM_TARGET_GLES2)
drawInternal(_count, _baseVertex, _instanceCount, _indexOffset, _indexStart, _indexEnd);
#else
drawInternal(_count, _baseVertex, _instanceCount, _indexOffset);
#endif
}
#endif
private:
#ifndef DOXYGEN_GENERATING_OUTPUT
struct MAGNUM_LOCAL GenericAttribute {

12
src/Magnum/MeshView.cpp

@ -156,16 +156,4 @@ void MeshView::draw(AbstractShaderProgram& shader) {
#endif
}
#ifdef MAGNUM_BUILD_DEPRECATED
void MeshView::draw() {
#ifndef MAGNUM_TARGET_GLES
_original.get().drawInternal(_count, _baseVertex, _instanceCount, _baseInstance, _indexOffset, _indexStart, _indexEnd);
#elif !defined(MAGNUM_TARGET_GLES2)
_original.get().drawInternal(_count, _baseVertex, _instanceCount, _indexOffset, _indexStart, _indexEnd);
#else
_original.get().drawInternal(_count, _baseVertex, _instanceCount, _indexOffset);
#endif
}
#endif
}

12
src/Magnum/MeshView.h

@ -36,10 +36,6 @@
#include "Magnum/OpenGL.h"
#include "Magnum/visibility.h"
#ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h>
#endif
namespace Magnum {
namespace Implementation { struct MeshState; }
@ -212,14 +208,6 @@ class MAGNUM_EXPORT MeshView {
void draw(AbstractShaderProgram& shader);
void draw(AbstractShaderProgram&& shader) { draw(shader); } /**< @overload */
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @copybrief draw(AbstractShaderProgram&)
* @deprecated Use @ref draw(AbstractShaderProgram&) instead.
*/
CORRADE_DEPRECATED("use draw(AbstractShaderProgram&) instead") void draw();
#endif
private:
#ifndef MAGNUM_TARGET_WEBGL
static MAGNUM_LOCAL void multiDrawImplementationDefault(std::initializer_list<std::reference_wrapper<MeshView>> meshes);

Loading…
Cancel
Save