FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Michael Platings, "the build is broken if you have the OSG_REF_PTR_IMPLICIT_OUTPUT_CONVERSION turned off - the attached files fix this."

Browse Source
This commit is contained in:
Robert Osfield
2010-11-22 17:37:35 +00:00
parent e36c4d3a3b
commit 78cdf41d53
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgUtil/IncrementalCompileOperation.cpp
View File

@@ -226,7 +226,7 @@ void CompileOperator::runTimingTests(osg::RenderInfo& renderInfo)
unsigned int numVertices = pow(2.0,double(i));
osg::ref_ptr<osg::Geometry> geometry = createTestGeometry(numVertices, useVBO);
double size = geometry->getGLObjectSizeHint();
double time = timeCompile(renderInfo, geometry);
double time = timeCompile(renderInfo, geometry.get());
OSG_NOTICE<<" numVertices = "<<numVertices<<" size = "<<size<<", time = "<<time*1000.0<<"ms rate= "<<(size/time)*Mbsec<<"Mb/sec"<<std::endl;
}
}
@@ -239,7 +239,7 @@ void CompileOperator::runTimingTests(osg::RenderInfo& renderInfo)
unsigned int numVertices = pow(2.0,double(i));
osg::ref_ptr<osg::Geometry> geometry = createTestGeometry(numVertices, useVBO);
double size = geometry->getGLObjectSizeHint();
double time = timeCompile(renderInfo, geometry);
double time = timeCompile(renderInfo, geometry.get());
OSG_NOTICE<<" numVertices = "<<numVertices<<" size = "<<size<<", time = "<<time*1000.0<<"ms rate= "<<(size/time)*Mbsec<<"Mb/sec"<<std::endl;
}
}