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

Fixed Geometry::drawImplmentation() handling of VBO's to prevent them from being used when display lists are used.

Browse Source
This commit is contained in:
Robert Osfield 2018-04-16 15:05:11 +01:00
parent 15429198b8
commit 9d72bf4712
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osg/Geometry.cpp
View File

@ -877,6 +877,12 @@ void Geometry::drawImplementation(RenderInfo& renderInfo) const
State& state = *renderInfo.getState();
bool usingVertexBufferObjects = state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects);
bool usingVertexArrayObjects = usingVertexBufferObjects && state.useVertexArrayObject(_useVertexArrayObject);
osg::VertexArrayState* vas = state.getCurrentVertexArrayState();
vas->setVertexBufferObjectSupported(usingVertexBufferObjects);
bool checkForGLErrors = state.getCheckForGLErrors()==osg::State::ONCE_PER_ATTRIBUTE;
if (checkForGLErrors) state.checkGLErrors("start of Geometry::drawImplementation()");
@ -892,13 +898,9 @@ void Geometry::drawImplementation(RenderInfo& renderInfo) const
drawPrimitivesImplementation(renderInfo);
bool usingVertexBufferObjects = state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects);
bool usingVertexArrayObjects = usingVertexBufferObjects && state.useVertexArrayObject(_useVertexArrayObject);
if (usingVertexBufferObjects && !usingVertexArrayObjects)
{
// unbind the VBO's if any are used.
osg::VertexArrayState* vas = state.getCurrentVertexArrayState();
vas->unbindVertexBufferObject();
vas->unbindElementBufferObject();
}