Changeset 10588 for OpenSceneGraph/trunk/src/osgViewer/Viewer.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/osgViewer/Viewer.cpp (modified) (48 diffs)

OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -66 +66 @@
     //arguments.getApplicationUsage()->addCommandLineOption("--collar","");
     //arguments.getApplicationUsage()->addCommandLineOption("--im","");
-    
+
     std::string filename;
     bool readConfig = false;
@@ -140 +140 @@
         while (arguments.read("--wow-M",wow_M)) {}
         while (arguments.read("--wow-C",wow_C)) {}
-            
+
         if (screenNum<0) screenNum = 0;
-        
+
         setUpViewForWoWVxDisplay( screenNum, wow_content, wow_factor, wow_offset, wow_Zd, wow_vz, wow_M, wow_C );
     }
@@ -175 +175 @@
         if (screenNum>=0) setUpViewInWindow(x, y, width, height, screenNum);
         else setUpViewInWindow(x,y,width,height);
-        
+
     }
     else if (screenNum>=0)
@@ -195 +195 @@
     _eventVisitor->setActionAdapter(this);
     _eventVisitor->setFrameStamp(_frameStamp.get());
-    
+
     _updateVisitor = new osgUtil::UpdateVisitor;
     _updateVisitor->setFrameStamp(_frameStamp.get());
@@ -214 +214 @@
 
     stopThreading();
-    
+
     if (_scene.valid() && _scene->getDatabasePager())
     {
@@ -231 +231 @@
         (*citr)->close();
     }
-    
+
     //osg::notify(osg::NOTICE)<<"finish Viewer::~Viewer()"<<std::endl;
-    
+
     getAllThreads(threads);
 
@@ -243 +243 @@
 {
     osgViewer::View::take(rhs);
-    
+
 #if 1
     osgViewer::Viewer* rhs_viewer = dynamic_cast<osgViewer::Viewer*>(&rhs);
@@ -278 +278 @@
         rhs_viewer->_currentContext = 0;
     }
-#endif    
+#endif
 }
 
@@ -284 +284 @@
 {
     osg::notify(osg::INFO)<<"Viewer::readConfiguration("<<filename<<")"<<std::endl;
-    
+
     osg::ref_ptr<osg::Object> object = osgDB::readObjectFile(filename);
-    if (!object) 
+    if (!object)
     {
         //osg::notify(osg::NOTICE)<<"Error: Unable to load configuration file \""<<filename<<"\""<<std::endl;
         return false;
     }
-    
+
     CompositeViewer* compositeViewer = dynamic_cast<CompositeViewer*>(object.get());
     if (compositeViewer)
@@ -298 +298 @@
         return false;
     }
-    
+
     View* view = dynamic_cast<osgViewer::View*>(object.get());
     if (view)
@@ -307 +307 @@
     }
     else
-    {    
+    {
         osg::notify(osg::NOTICE)<<"Error: Config file \""<<filename<<"\" does not contain a valid Viewer configuration."<<std::endl;
         return false;
@@ -327 +327 @@
         if ((*citr)->isRealized()) ++numRealizedWindows;
     }
-    
+
     return numRealizedWindows > 0;
 }
@@ -420 +420 @@
 {
     //osg::notify(osg::INFO)<<"Viewer::realize()"<<std::endl;
-    
+
     setCameraWithFocus(0);
 
     Contexts contexts;
     getContexts(contexts);
-    
+
     if (contexts.empty())
     {
         osg::notify(osg::INFO)<<"Viewer::realize() - No valid contexts found, setting up view across all screens."<<std::endl;
-    
-        // no windows are already set up so set up a default view        
-        
+
+        // no windows are already set up so set up a default view
+
         const char* ptr = 0;
         if ((ptr = getenv("OSG_CONFIG_FILE")) != 0)
@@ -467 +467 @@
             }
         }
-        
+
         getContexts(contexts);
     }
@@ -477 +477 @@
         return;
     }
-    
+
+    unsigned int maxTexturePoolSize = osg::DisplaySettings::instance()->getMaxTexturePoolSize();
+    if (_camera->getDisplaySettings()) maxTexturePoolSize = std::max(maxTexturePoolSize, _camera->getDisplaySettings()->getMaxTexturePoolSize());
+    if (_displaySettings.valid()) maxTexturePoolSize = std::max(maxTexturePoolSize, _displaySettings->getMaxTexturePoolSize());
+
+    unsigned int maxVBOPoolSize = osg::DisplaySettings::instance()->getMaxVBOPoolSize();
+    if (_displaySettings.valid()) maxVBOPoolSize = std::max(maxVBOPoolSize, _displaySettings->getMaxVBOPoolSize());
+    if (_camera->getDisplaySettings()) maxVBOPoolSize = std::max(maxVBOPoolSize, _camera->getDisplaySettings()->getMaxVBOPoolSize());
+
+    unsigned int maxFBOPoolSize = osg::DisplaySettings::instance()->getMaxFBOPoolSize();
+    if (_displaySettings.valid()) maxFBOPoolSize = std::max(maxFBOPoolSize, _displaySettings->getMaxFBOPoolSize());
+    if (_camera->getDisplaySettings()) maxFBOPoolSize = std::max(maxFBOPoolSize, _camera->getDisplaySettings()->getMaxFBOPoolSize());
+
     for(Contexts::iterator citr = contexts.begin();
         citr != contexts.end();
@@ -483 +495 @@
     {
         osg::GraphicsContext* gc = *citr;
+
+        // set the pool sizes, 0 the default will result in no GL object pools.
+        gc->getState()->setMaxTexturePoolSize(maxTexturePoolSize);
+        gc->getState()->setMaxVBOPoolSize(maxVBOPoolSize);
+        gc->getState()->setMaxFBOPoolSize(maxFBOPoolSize);
+
         gc->realize();
-        
+
         if (_realizeOperation.valid() && gc->valid())
         {
             gc->makeCurrent();
-            
+
             (*_realizeOperation)(gc);
-            
+
             gc->releaseContext();
         }
@@ -508 +526 @@
             if (gw)
             {
-                gw->grabFocusIfPointerInWindow();    
-            }
-        }
-    }
-    
+                gw->grabFocusIfPointerInWindow();
+            }
+        }
+    }
+
     // initialize the global timer to be relative to the current time.
     osg::Timer::instance()->setStartTick();
@@ -520 +538 @@
 
     setUpThreading();
-    
+
     if (osg::DisplaySettings::instance()->getCompileContextsHint())
     {
@@ -535 +553 @@
                 gc->getGraphicsThread()->setProcessorAffinity(processNum % numProcessors);
                 gc->getGraphicsThread()->startThread();
-                
+
                 ++processNum;
             }
         }
     }
-    
+
 }
 
@@ -564 +582 @@
         _frameStamp->setSimulationTime(simulationTime);
     }
-    
+
     if (getViewerStats() && getViewerStats()->collectStats("frame_rate"))
     {
@@ -591 +609 @@
 
     // osg::notify(osg::NOTICE)<<"Viewer::frameEventTraversal()."<<std::endl;
-    
+
     // need to copy events from the GraphicsWindow's into local EventQueue;
     osgGA::EventQueue::Events events;
@@ -598 +616 @@
     getContexts(contexts);
 
-    osgGA::GUIEventAdapter* eventState = getEventQueue()->getCurrentEventState(); 
+    osgGA::GUIEventAdapter* eventState = getEventQueue()->getCurrentEventState();
     osg::Matrix masterCameraVPW = getCamera()->getViewMatrix() * getCamera()->getProjectionMatrix();
-    if (getCamera()->getViewport()) 
+    if (getCamera()->getViewport())
     {
         osg::Viewport* viewport = getCamera()->getViewport();
@@ -620 +638 @@
         {
             gw->checkEvents();
-            
+
             osgGA::EventQueue::Events gw_events;
             gw->getEventQueue()->takeEvents(gw_events);
-            
+
             osgGA::EventQueue::Events::iterator itr;
             for(itr = gw_events.begin();
@@ -630 +648 @@
             {
                 osgGA::GUIEventAdapter* event = itr->get();
-                
+
                 bool pointerEvent = false;
 
                 float x = event->getX();
                 float y = event->getY();
-                
+
                 bool invert_y = event->getMouseYOrientation()==osgGA::GUIEventAdapter::Y_INCREASING_DOWNWARDS;
                 if (invert_y && gw->getTraits()) y = gw->getTraits()->height - y;
-                
+
                 switch(event->getEventType())
                 {
@@ -647 +665 @@
                     {
                         pointerEvent = true;
-                        
+
                         if (event->getEventType()!=osgGA::GUIEventAdapter::DRAG || !getCameraWithFocus())
                         {
@@ -656 +674 @@
                             {
                                 osg::Camera* camera = *citr;
-                                if (camera->getView()==this && 
+                                if (camera->getView()==this &&
                                     camera->getAllowEventFocus() &&
                                     camera->getRenderTargetImplementation()==osg::Camera::FRAME_BUFFER)
                                 {
                                     osg::Viewport* viewport = camera ? camera->getViewport() : 0;
-                                    if (viewport && 
+                                    if (viewport &&
                                         x >= viewport->x() && y >= viewport->y() &&
                                         x <= (viewport->x()+viewport->width()) && y <= (viewport->y()+viewport->height()) )
@@ -671 +689 @@
                             }
                         }
-                        
+
                         break;
                     }
@@ -677 +695 @@
                         break;
                 }
-                
+
                 if (pointerEvent)
                 {
@@ -691 +709 @@
 
                         x = new_coord.x();
-                        y = new_coord.y();                                
+                        y = new_coord.y();
 
                         // osg::notify(osg::NOTICE)<<"pointer event new_coord.x()="<<new_coord.x()<<" new_coord.y()="<<new_coord.y()<<std::endl;
@@ -712 +730 @@
                         event->setMouseYOrientation(osgGA::GUIEventAdapter::Y_INCREASING_UPWARDS);
                     }
-                    
-                    // pass along the new pointer events details to the eventState of the viewer 
+
+                    // pass along the new pointer events details to the eventState of the viewer
                     eventState->setX(x);
                     eventState->setY(y);
@@ -743 +761 @@
                         bool wasThreading = areThreadsRunning();
                         if (wasThreading) stopThreading();
-                        
+
                         gw->close();
-                        _currentContext = NULL; 
-                        
+                        _currentContext = NULL;
+
                         if (wasThreading) startThreading();
-                        
+
                         break;
                     }
@@ -760 +778 @@
         }
     }
-    
+
 
     // osg::notify(osg::NOTICE)<<"mouseEventState Xmin = "<<eventState->getXmin()<<" Ymin="<<eventState->getYmin()<<" xMax="<<eventState->getXmax()<<" Ymax="<<eventState->getYmax()<<std::endl;
@@ -816 +834 @@
 
     // osg::notify(osg::NOTICE)<<"Events "<<events.size()<<std::endl;
-    
+
     if ((_keyEventSetsDone!=0) || _quitEventSetsDone)
     {
@@ -829 +847 @@
                     if (_keyEventSetsDone && event->getKey()==_keyEventSetsDone) _done = true;
                     break;
-                
+
                 case(osgGA::GUIEventAdapter::QUIT_APPLICATION):
                     if (_quitEventSetsDone) _done = true;
                     break;
-                    
+
                 default:
                     break;
@@ -839 +857 @@
         }
     }
-        
+
     if (_done) return;
 
@@ -889 +907 @@
             (*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *this, 0, 0);
         }
-        
+
     }
 
@@ -902 +920 @@
         }
     }
-    
+
     if (getViewerStats() && getViewerStats()->collectStats("event"))
     {
@@ -1004 +1022 @@
     OperationThreads operationThreads;
     getOperationThreads(operationThreads);
-    
+
     for(OperationThreads::iterator itr = operationThreads.begin();
         itr != operationThreads.end();
@@ -1011 +1029 @@
         threads.push_back(*itr);
     }
-    
+
 
     if (_scene.valid())
@@ -1034 +1052 @@
 {
     threads.clear();
-    
+
     Contexts contexts;
     getContexts(contexts);
@@ -1042 +1060 @@
     {
         osg::GraphicsContext* gc = *gcitr;
-        if (gc->getGraphicsThread() && 
+        if (gc->getGraphicsThread() &&
             (!onlyActive || gc->getGraphicsThread()->isRunning()) )
         {
@@ -1048 +1066 @@
         }
     }
-    
+
     Cameras cameras;
     getCameras(cameras);
@@ -1056 +1074 @@
     {
         osg::Camera* camera = *citr;
-        if (camera->getCameraThread() && 
+        if (camera->getCameraThread() &&
             (!onlyActive || camera->getCameraThread()->isRunning()) )
         {
@@ -1062 +1080 @@
         }
     }
-    
+
 }
 
@@ -1072 +1090 @@
     contexts.clear();
 
-    if (_camera.valid() && 
-        _camera->getGraphicsContext() && 
+    if (_camera.valid() &&
+        _camera->getGraphicsContext() &&
         (_camera->getGraphicsContext()->valid() || !onlyValid))
     {
@@ -1079 +1097 @@
         contexts.push_back(_camera->getGraphicsContext());
     }
-    
+
     for(unsigned int i=0; i<getNumSlaves(); ++i)
     {
@@ -1098 +1116 @@
 {
     cameras.clear();
-    
-    if (_camera.valid() && 
+
+    if (_camera.valid() &&
         (!onlyActive || (_camera->getGraphicsContext() && _camera->getGraphicsContext()->valid())) ) cameras.push_back(_camera.get());