From 116f474fabd16f0994f5c5d413c6981bf64f3086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 28 Mar 2014 16:43:06 +0100
Subject: [PATCH] Removed long-deprecated *::maxSupported*() limit queries.

Use alternatives without the "Supported" substring instead.
---
 src/Magnum/AbstractShaderProgram.h | 9 ---------
 src/Magnum/AbstractTexture.cpp     | 1 -
 src/Magnum/AbstractTexture.h       | 9 ---------
 src/Magnum/Sampler.h               | 7 -------
 4 files changed, 26 deletions(-)

diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h
index 40dbe55fe..c5eb12559 100644
--- a/src/Magnum/AbstractShaderProgram.h
+++ b/src/Magnum/AbstractShaderProgram.h
@@ -343,15 +343,6 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
          */
         static Int maxVertexAttributes();
 
-        #ifdef MAGNUM_BUILD_DEPRECATED
-        /**
-         * @copydoc maxVertexAttributes()
-         * @deprecated Use @ref Magnum::AbstractShaderProgram::maxVertexAttributes() "maxVertexAttributes()"
-         *      instead.
-         */
-        static CORRADE_DEPRECATED("use maxVertexAttributes() instead") Int maxSupportedVertexAttributeCount() { return maxVertexAttributes(); }
-        #endif
-
         #ifndef MAGNUM_TARGET_GLES
         /**
          * @brief Max supported atomic counter buffer size
diff --git a/src/Magnum/AbstractTexture.cpp b/src/Magnum/AbstractTexture.cpp
index 5766ae09f..31bf05f99 100644
--- a/src/Magnum/AbstractTexture.cpp
+++ b/src/Magnum/AbstractTexture.cpp
@@ -48,7 +48,6 @@ namespace Magnum {
 
 #ifdef MAGNUM_BUILD_DEPRECATED
 Int AbstractTexture::maxLayers() { return Shader::maxCombinedTextureImageUnits(); }
-Int AbstractTexture::maxSupportedLayerCount() { return Shader::maxCombinedTextureImageUnits(); }
 #endif
 
 #ifndef MAGNUM_TARGET_GLES
diff --git a/src/Magnum/AbstractTexture.h b/src/Magnum/AbstractTexture.h
index 6b57cace1..c8e7cba18 100644
--- a/src/Magnum/AbstractTexture.h
+++ b/src/Magnum/AbstractTexture.h
@@ -122,15 +122,6 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
         static CORRADE_DEPRECATED("use Shader::maxCombinedTextureImageUnits() instead") Int maxLayers();
         #endif
 
-        #ifdef MAGNUM_BUILD_DEPRECATED
-        /**
-         * @copybrief Shader::maxCombinedTextureImageUnits()
-         * @deprecated Use @ref Magnum::Shader::maxCombinedTextureImageUnits() "Shader::maxCombinedTextureImageUnits()"
-         *      instead.
-         */
-        static CORRADE_DEPRECATED("use Shader::maxCombinedTextureImageUnits() instead") Int maxSupportedLayerCount();
-        #endif
-
         #ifndef MAGNUM_TARGET_GLES
         /**
          * @brief Max supported color sample count
diff --git a/src/Magnum/Sampler.h b/src/Magnum/Sampler.h
index b2c6e995a..51a6ba890 100644
--- a/src/Magnum/Sampler.h
+++ b/src/Magnum/Sampler.h
@@ -150,13 +150,6 @@ class MAGNUM_EXPORT Sampler {
          *      instead.
          */
         static CORRADE_DEPRECATED("use maxMaxAnisotropy() instead") Float maxAnisotropy() { return maxMaxAnisotropy(); }
-
-        /**
-         * @copybrief maxMaxAnisotropy()
-         * @deprecated Use @ref Magnum::Sampler::maxMaxAnisotropy() "maxMaxAnisotropy()"
-         *      instead.
-         */
-        static CORRADE_DEPRECATED("use maxMaxAnisotropy() instead") Float maxSupportedAnisotropy() { return maxMaxAnisotropy(); }
         #endif
 };