From 4b4b438d4431a53fe652fe6ac1d9659ad7f26e3c Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 14 Dec 2010 15:28:31 +0000
Subject: [PATCH] Removed redundent
 MinimumNumberOfTextureObjectsToRetainInCache static variable

---
 include/osg/Texture         |  7 -------
 src/osg/Texture.cpp         | 12 ------------
 src/osgDB/DatabasePager.cpp |  6 ------
 3 files changed, 25 deletions(-)

diff --git a/include/osg/Texture b/include/osg/Texture
index 9ff0fb291..e6dc95f14 100644
--- a/include/osg/Texture
+++ b/include/osg/Texture
@@ -1238,13 +1238,6 @@ class OSG_EXPORT Texture : public osg::StateAttribute
                                                      GLsizei   depth,
                                                      GLint     border);
 
-
-        /** Set the minimum number of texture objects to retain in the deleted display list cache. */
-        static void setMinimumNumberOfTextureObjectsToRetainInCache(unsigned int minimum);
-
-        /** Get the minimum number of display lists to retain in the deleted display list cache. */
-        static unsigned int getMinimumNumberOfTextureObjectsToRetainInCache();
-
         static void deleteAllTextureObjects(unsigned int contextID);
         static void discardAllTextureObjects(unsigned int contextID);
         static void flushAllDeletedTextureObjects(unsigned int contextID);
diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp
index cc26a637b..5540ceb9b 100644
--- a/src/osg/Texture.cpp
+++ b/src/osg/Texture.cpp
@@ -57,18 +57,6 @@ ApplicationUsageProxy Texture_e0(ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_M
 typedef buffered_value< ref_ptr<Texture::Extensions> > BufferedExtensions;
 static BufferedExtensions s_extensions;
 
-unsigned int s_minimumNumberOfTextureObjectsToRetainInCache = 0;
-
-void Texture::setMinimumNumberOfTextureObjectsToRetainInCache(unsigned int minimum)
-{
-    s_minimumNumberOfTextureObjectsToRetainInCache = minimum;
-}
-
-unsigned int Texture::getMinimumNumberOfTextureObjectsToRetainInCache()
-{
-    return s_minimumNumberOfTextureObjectsToRetainInCache;
-}
-
 
 Texture::TextureObject::~TextureObject()
 {
diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp
index 4708e2a78..2e3f34668 100644
--- a/src/osgDB/DatabasePager.cpp
+++ b/src/osgDB/DatabasePager.cpp
@@ -1202,15 +1202,9 @@ DatabasePager::DatabasePager(const DatabasePager& rhs)
     _inactivePagedLODList = rhs._inactivePagedLODList->clone();
 
 #if 1
-    // need to set the texture object manager to be able to reuse textures
-    osg::Texture::setMinimumNumberOfTextureObjectsToRetainInCache(100);
-
     // need to set the display list manager to be able to reuse display lists
     osg::Drawable::setMinimumNumberOfDisplayListsToRetainInCache(100);
 #else
-    // need to set the texture object manager to be able to reuse textures
-    osg::Texture::setMinimumNumberOfTextureObjectsToRetainInCache(0);
-
     // need to set the display list manager to be able to reuse display lists
     osg::Drawable::setMinimumNumberOfDisplayListsToRetainInCache(0);
 #endif