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

Improved the management of the unbinding of VBO's and EBO's

Browse Source
This commit is contained in:
Robert Osfield
2017-03-09 18:17:53 +00:00
parent 445f2bfe21
commit 5b78e334a9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osg/Geometry.cpp
View File

@@ -858,12 +858,15 @@ void Geometry::drawImplementation(RenderInfo& renderInfo) const
drawPrimitivesImplementation(renderInfo);
if (renderInfo.getState()->useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects) &&
(!state.useVertexArrayObject(_useVertexArrayObject) || state.getCurrentVertexArrayState()->getRequiresSetArrays()))
bool usingVertexBufferObjects = state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects);
bool usingVertexArrayObjects = usingVertexBufferObjects && state.useVertexArrayObject(_useVertexArrayObject);
if (usingVertexBufferObjects && !usingVertexArrayObjects)
{
// unbind the VBO's if any are used.
state.unbindVertexBufferObject();
state.unbindElementBufferObject();
osg::VertexArrayState* vas = state.getCurrentVertexArrayState();
vas->unbindVertexBufferObject();
vas->unbindElementBufferObject();
}
if (checkForGLErrors) state.checkGLErrors("end of Geometry::drawImplementation().");