Changeset 13041 for OpenSceneGraph/trunk/src/osgViewer/Renderer.cpp
- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
-
OpenSceneGraph/trunk/src/osgViewer/Renderer.cpp (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgViewer/Renderer.cpp
r12718 r13041 54 54 typedef std::list<QueryFrameNumberPair> QueryFrameNumberList; 55 55 typedef std::vector<GLuint> QueryList; 56 56 57 57 QueryFrameNumberList _queryFrameNumberList; 58 58 QueryList _availableQueryObjects; … … 148 148 virtual void checkQuery(osg::Stats* stats, osg::State* state, 149 149 osg::Timer_t startTick); 150 150 151 151 virtual void beginQuery(unsigned int frameNumber, osg::State* state); 152 152 virtual void endQuery(osg::State* state); … … 378 378 osgUtil::IncrementalCompileOperation* ico = viewer ? viewer->getIncrementalCompileOperation() : 0; 379 379 bool automaticFlush = (ico==NULL); 380 380 381 381 osg::DisplaySettings* ds = _camera->getDisplaySettings() ? _camera->getDisplaySettings() : 382 382 ((view && view->getDisplaySettings()) ? view->getDisplaySettings() : osg::DisplaySettings::instance().get()); … … 502 502 503 503 sceneView->setAutomaticFlush(automaticFlush); 504 504 505 505 osgDB::DatabasePager* databasePager = view ? view->getDatabasePager() : 0; 506 506 sceneView->getCullVisitor()->setDatabaseRequestHandler(databasePager); … … 541 541 sceneView->getSceneData()->accept(glov); 542 542 } 543 543 544 544 sceneView->getState()->checkGLErrors("After Renderer::compile"); 545 545 } … … 732 732 733 733 _availableQueue.add(sceneView); 734 734 735 735 if (acquireGPUStats) 736 736 {
