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

Added handling of failure to create ElementBufferObject.

Browse Source
This commit is contained in:
Robert Osfield 2016-06-02 15:35:47 +01:00
parent 9eb9186200
commit 700e38ba9d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/osgTerrain/GeometryPool.cpp
View File

@ -958,14 +958,21 @@ void SharedGeometry::drawImplementation(osg::RenderInfo& renderInfo) const
osg::GLBufferObject* ebo = _drawElements->getOrCreateGLBufferObject(state.getContextID()); osg::GLBufferObject* ebo = _drawElements->getOrCreateGLBufferObject(state.getContextID());
state.bindElementBufferObject(ebo); if (ebo)
{
state.bindElementBufferObject(ebo);
glDrawElements(primitiveType, _drawElements->getNumIndices(), _drawElements->getDataType(), (const GLvoid *)(ebo->getOffset(_drawElements->getBufferIndex()))); glDrawElements(primitiveType, _drawElements->getNumIndices(), _drawElements->getDataType(), (const GLvoid *)(ebo->getOffset(_drawElements->getBufferIndex())));
state.unbindElementBufferObject();
}
else
{
glDrawElements(primitiveType, _drawElements->getNumIndices(), _drawElements->getDataType(), _drawElements->getDataPointer());
}
// unbind the VBO's if any are used. // unbind the VBO's if any are used.
state.unbindVertexBufferObject(); state.unbindVertexBufferObject();
state.unbindElementBufferObject();
if (checkForGLErrors) state.checkGLErrors("end of SharedGeometry::drawImplementation()."); if (checkForGLErrors) state.checkGLErrors("end of SharedGeometry::drawImplementation().");
} }