From 0ee65c9d2f1dced959f32608185f05a4e96e7e6d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 2 Sep 2016 19:26:20 +0100 Subject: [PATCH] Removed unneccessary parameter --- include/osg/Drawable | 4 ++-- include/osg/Geometry | 2 +- include/osgParticle/ParticleSystem | 2 +- src/osg/Drawable.cpp | 2 +- src/osg/Geometry.cpp | 4 ++-- src/osgParticle/ParticleSystem.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/osg/Drawable b/include/osg/Drawable index 3f955f683..cd3be1de4 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -278,7 +278,7 @@ class OSG_EXPORT Drawable : public Node */ virtual void compileGLObjects(RenderInfo& renderInfo) const; - virtual VertexArrayState* createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const; + virtual VertexArrayState* createVertexArrayState(RenderInfo& renderInfo) const; /** Set whether to use a mutex to ensure ref() and unref() are thread safe.*/ @@ -509,7 +509,7 @@ inline void Drawable::draw(RenderInfo& renderInfo) const VertexArrayState* vas = _vertexArrayStateList[contextID].get(); if (!vas) { - _vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo, true); + _vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo); } else { diff --git a/include/osg/Geometry b/include/osg/Geometry index 50d1dd48d..4eca0ecd8 100644 --- a/include/osg/Geometry +++ b/include/osg/Geometry @@ -230,7 +230,7 @@ class OSG_EXPORT Geometry : public Drawable bool _containsDeprecatedData; - virtual VertexArrayState* createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const; + virtual VertexArrayState* createVertexArrayState(RenderInfo& renderInfo) const; public: diff --git a/include/osgParticle/ParticleSystem b/include/osgParticle/ParticleSystem index a38a5a1c5..4348cb075 100644 --- a/include/osgParticle/ParticleSystem +++ b/include/osgParticle/ParticleSystem @@ -265,7 +265,7 @@ namespace osgParticle * for all graphics contexts. */ virtual void releaseGLObjects(osg::State* state=0) const; - virtual osg::VertexArrayState* createVertexArrayState(osg::RenderInfo& renderInfo, bool usingVBOs) const; + virtual osg::VertexArrayState* createVertexArrayState(osg::RenderInfo& renderInfo) const; void adjustEstimatedMaxNumOfParticles(int delta) { _estimatedMaxNumOfParticles += delta; } diff --git a/src/osg/Drawable.cpp b/src/osg/Drawable.cpp index 713f970c8..84f8b6859 100644 --- a/src/osg/Drawable.cpp +++ b/src/osg/Drawable.cpp @@ -696,7 +696,7 @@ void Drawable::draw(RenderInfo& renderInfo) const #endif -VertexArrayState* Drawable::createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const +VertexArrayState* Drawable::createVertexArrayState(RenderInfo& renderInfo) const { VertexArrayState* vos = new osg::VertexArrayState(renderInfo.getState()); vos->assignAllDispatchers(); diff --git a/src/osg/Geometry.cpp b/src/osg/Geometry.cpp index 9203848e5..54d637365 100644 --- a/src/osg/Geometry.cpp +++ b/src/osg/Geometry.cpp @@ -672,7 +672,7 @@ void Geometry::releaseGLObjects(State* state) const } -VertexArrayState* Geometry::createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const +VertexArrayState* Geometry::createVertexArrayState(RenderInfo& renderInfo) const { State& state = *renderInfo.getState(); @@ -768,7 +768,7 @@ void Geometry::compileGLObjects(RenderInfo& renderInfo) const { VertexArrayState* vas = 0; - _vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo, true); + _vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo); State::SetCurrentVertexArrayStateProxy setVASProxy(state, vas); diff --git a/src/osgParticle/ParticleSystem.cpp b/src/osgParticle/ParticleSystem.cpp index 1752568bc..7d95b3516 100644 --- a/src/osgParticle/ParticleSystem.cpp +++ b/src/osgParticle/ParticleSystem.cpp @@ -657,7 +657,7 @@ void osgParticle::ParticleSystem::releaseGLObjects(osg::State* state) const } } -osg::VertexArrayState* osgParticle::ParticleSystem::createVertexArrayState(osg::RenderInfo& renderInfo, bool usingVBOs) const +osg::VertexArrayState* osgParticle::ParticleSystem::createVertexArrayState(osg::RenderInfo& renderInfo) const { osg::State& state = *renderInfo.getState();