Browse Source

Removed deprecated *Texture::maxLayers().

Use Shader::maxCombinedTextureImageUnits() instead.
pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
503ce1f948
  1. 8
      src/Magnum/AbstractTexture.cpp
  2. 8
      src/Magnum/AbstractTexture.h

8
src/Magnum/AbstractTexture.cpp

@ -37,10 +37,6 @@
#include "Magnum/TextureFormat.h"
#include "Magnum/Math/Range.h"
#ifdef MAGNUM_BUILD_DEPRECATED
#include "Magnum/Shader.h"
#endif
#ifndef MAGNUM_TARGET_WEBGL
#include "Implementation/DebugState.h"
#endif
@ -49,10 +45,6 @@
namespace Magnum {
#ifdef MAGNUM_BUILD_DEPRECATED
Int AbstractTexture::maxLayers() { return Shader::maxCombinedTextureImageUnits(); }
#endif
#ifndef MAGNUM_TARGET_GLES2
Float AbstractTexture::maxLodBias() {
GLfloat& value = Context::current()->state().texture->maxLodBias;

8
src/Magnum/AbstractTexture.h

@ -143,14 +143,6 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
friend CubeMapTexture;
public:
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @copybrief Shader::maxCombinedTextureImageUnits()
* @deprecated Use @ref Shader::maxCombinedTextureImageUnits() instead.
*/
static CORRADE_DEPRECATED("use Shader::maxCombinedTextureImageUnits() instead") Int maxLayers();
#endif
#ifndef MAGNUM_TARGET_GLES2
/**
* @brief Max level-of-detail bias

Loading…
Cancel
Save