From 503ce1f948cb79d845f7f5171f8785bc082e0923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 25 May 2015 23:37:29 +0200 Subject: [PATCH] Removed deprecated *Texture::maxLayers(). Use Shader::maxCombinedTextureImageUnits() instead. --- src/Magnum/AbstractTexture.cpp | 8 -------- src/Magnum/AbstractTexture.h | 8 -------- 2 files changed, 16 deletions(-) diff --git a/src/Magnum/AbstractTexture.cpp b/src/Magnum/AbstractTexture.cpp index 341913cf4..930bba84c 100644 --- a/src/Magnum/AbstractTexture.cpp +++ b/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; diff --git a/src/Magnum/AbstractTexture.h b/src/Magnum/AbstractTexture.h index e00d9a966..5d3d8fc9f 100644 --- a/src/Magnum/AbstractTexture.h +++ b/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