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

Added intialization of the VAO in Geometry::compileGLObjects() and refined the invocation of updates to the VAO

Browse Source
This commit is contained in:
Robert Osfield
2016-08-03 10:35:51 +01:00
parent 078598872f
commit 4131d2da34
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osg/Geometry.cpp
View File

@@ -699,8 +699,6 @@ VertexArrayState* Geometry::setUpVertexArrayState(RenderInfo& renderInfo, bool u
void Geometry::compileGLObjects(RenderInfo& renderInfo) const
{
State& state = *renderInfo.getState();
const DisplaySettings* ds = state.getDisplaySettings() ? state.getDisplaySettings() : osg::DisplaySettings::instance();
bool useVertexArrays = _supportsVertexBufferObjects &&
_useVertexBufferObjects &&
renderInfo.getState()->isVertexBufferObjectSupported();
@@ -762,9 +760,19 @@ void Geometry::compileGLObjects(RenderInfo& renderInfo) const
extensions->glBindBuffer(GL_ARRAY_BUFFER_ARB,0);
extensions->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB,0);
const DisplaySettings* ds = state.getDisplaySettings() ? state.getDisplaySettings() : osg::DisplaySettings::instance();
if (ds->getGeometryImplementation()==DisplaySettings::VERTEX_ARRAY_OBJECT && !bufferObjects.empty())
{
setUpVertexArrayState(renderInfo, true);
VertexArrayState* vas = 0;
_vertexArrayStateList[contextID] = vas = setUpVertexArrayState(renderInfo, true);
State::SetCurrentVertexArrayStateProxy setVASProxy(state, vas);
vas->bindVertexArrayObject();
drawVertexArraysImplementation(renderInfo);
}
}
else