Changeset 10588 for OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp

Timestamp:

09/22/09 20:45:24 (4 years ago)

Author:

robert

Message:

Preliminary work on support for a texture object pool that is designed to help manage resources down the GPU more tightly.

Files:

• OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp

@@ -81 +81 @@
     
     _application = vs._application;
+
+    _maxTexturePoolSize = vs._maxTexturePoolSize;
+    _maxVBOPoolSize = vs._maxVBOPoolSize;
+    _maxFBOPoolSize = vs._maxFBOPoolSize;
 }
 
@@ -104 +108 @@
 
     if (_application.empty()) _application = vs._application;
+
+    if (vs._maxTexturePoolSize>_maxTexturePoolSize) _maxTexturePoolSize = vs._maxTexturePoolSize;
+    if (vs._maxVBOPoolSize>_maxVBOPoolSize) _maxVBOPoolSize = vs._maxVBOPoolSize;
+    if (vs._maxFBOPoolSize>_maxFBOPoolSize) _maxFBOPoolSize = vs._maxFBOPoolSize;
 }
 
@@ -148 +156 @@
     _numDatabaseThreadsHint = 2;
     _numHttpDatabaseThreadsHint = 1;
+
+    _maxTexturePoolSize = 0;
+    _maxVBOPoolSize = 0;
+    _maxFBOPoolSize = 0;
 }
 
@@ -187 +199 @@
 static ApplicationUsageProxy DisplaySetting_e16(ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_NUM_HTTP_DATABASE_THREADS <int>","Set the hint for the total number of threads dedicated to http requests to set up in the DatabasePager.");
 static ApplicationUsageProxy DisplaySetting_e17(ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_MULTI_SAMPLES <int>","Set the hint for the number of samples to use when multi-sampling.");
+static ApplicationUsageProxy DisplaySetting_e18(ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_TEXTURE_POOL_SIZE <int>","Set the hint size of texture pool to manage.");
+static ApplicationUsageProxy DisplaySetting_e19(ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_VBO_POOL_SIZE <int>","Set the hint size of vertex buffer object pool to manage.");
+static ApplicationUsageProxy DisplaySetting_e20(ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_FBO_POOL_SIZE <int>","Set the hint size of frame buffer object pool to manage.");
 
 void DisplaySettings::readEnvironmentalVariables()
@@ -382 +397 @@
     {
         _numMultiSamples = atoi(ptr);
+    }
+
+    if( (ptr = getenv("OSG_TEXTURE_POOL_SIZE")) != 0)
+    {
+        _maxTexturePoolSize = atoi(ptr);
+    }
+
+    if( (ptr = getenv("OSG_VBO_POOL_SIZE")) != 0)
+    {
+        _maxVBOPoolSize = atoi(ptr);
+    }
+
+    if( (ptr = getenv("OSG_FBO_POOL_SIZE")) != 0)
+    {
+        _maxFBOPoolSize = atoi(ptr);
     }
 }
@@ -469 +499 @@
     while(arguments.read("--num-db-threads",_numDatabaseThreadsHint)) {}
     while(arguments.read("--num-http-threads",_numHttpDatabaseThreadsHint)) {}
-}
+
+    while(arguments.read("--texture-pool-size",_maxTexturePoolSize)) {}
+    while(arguments.read("--vbo-pool-size",_maxVBOPoolSize)) {}
+    while(arguments.read("--fbo-pool-size",_maxFBOPoolSize)) {}
+
+}
+
+
+