diff --git a/include/osgUtil/IncrementalCompileOperation b/include/osgUtil/IncrementalCompileOperation index 83283553d..298bdab54 100644 --- a/include/osgUtil/IncrementalCompileOperation +++ b/include/osgUtil/IncrementalCompileOperation @@ -36,8 +36,9 @@ class OSGUTIL_EXPORT StateToCompile : public osg::NodeVisitor GLObjectsVisitor::Mode _mode; DrawableSet _drawables; - TextureSet _textures; - ProgramSet _programs; + TextureSet _textures; + ProgramSet _programs; + bool _assignPBOToImages; bool empty() const { return _textures.empty() && _programs.empty() && _drawables.empty(); } diff --git a/src/osgUtil/GraphicsCostEstimator.cpp b/src/osgUtil/GraphicsCostEstimator.cpp index b26f83423..6fd244421 100644 --- a/src/osgUtil/GraphicsCostEstimator.cpp +++ b/src/osgUtil/GraphicsCostEstimator.cpp @@ -46,7 +46,6 @@ void GeometryCostEstimator::calibrate(osg::RenderInfo& renderInfo) CostPair GeometryCostEstimator::estimateCompileCost(const osg::Geometry* geometry) const { - OSG_INFO<<"GeometryCostEstimator::estimateCompileCost(..)"<getUseVertexBufferObjects() && geometry->areFastPathsUsed(); bool usesDL = !usesVBO && geometry->getUseDisplayList() && geometry->getSupportsDisplayList(); @@ -79,7 +78,7 @@ CostPair GeometryCostEstimator::estimateCompileCost(const osg::Geometry* geometr cost.first = _displayListCompileConstant + _displayListCompileFactor * cost.first ; } - OSG_INFO<<" cost.first="<setPixelBufferObject(pbo.get()); + } + } + } + } + } + _textures.insert(&texture); } @@ -282,7 +322,7 @@ double IncrementalCompileOperation::CompileList::estimatedTimeForCompile(Compile bool IncrementalCompileOperation::CompileList::compile(CompileInfo& compileInfo) { -//#define USE_TIME_ESTIMATES +#define USE_TIME_ESTIMATES for(CompileOps::iterator itr = _compileOps.begin(); itr != _compileOps.end() && compileInfo.availableTime()>0.0 && compileInfo.maxNumObjectsToCompile>0; @@ -307,7 +347,9 @@ bool IncrementalCompileOperation::CompileList::compile(CompileInfo& compileInfo) #ifdef USE_TIME_ESTIMATES double actualCompileCost = timer.elapsedTime(); - OSG_NOTICE<<"IncrementalCompileOperation::CompileList::compile() estimatedTimForCompile= "<