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

From Jannik Heller, fix for race condition in orphanded BufferObject handling.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14877 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-05-29 07:52:27 +00:00
parent 4f423ff66b
commit f72b62a065
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osg/BufferObject
View File

@@ -221,7 +221,7 @@ class OSG_EXPORT GLBufferObject : public Referenced
bool isPBOSupported() const { return _extensions->isPBOSupported; }
static GLBufferObject* createGLBufferObject(unsigned int contextID, const BufferObject* bufferObject);
static osg::ref_ptr<GLBufferObject> createGLBufferObject(unsigned int contextID, const BufferObject* bufferObject);
static void deleteAllBufferObjects(unsigned int contextID);
static void discardAllBufferObjects(unsigned int contextID);
@@ -287,8 +287,8 @@ class OSG_EXPORT GLBufferObjectSet : public Referenced
void discardAllDeletedGLBufferObjects();
void flushDeletedGLBufferObjects(double currentTime, double& availableTime);
GLBufferObject* takeFromOrphans(BufferObject* bufferObject);
GLBufferObject* takeOrGenerate(BufferObject* bufferObject);
osg::ref_ptr<GLBufferObject> takeFromOrphans(BufferObject* bufferObject);
osg::ref_ptr<GLBufferObject> takeOrGenerate(BufferObject* bufferObject);
void moveToBack(GLBufferObject* to);
void addToBack(GLBufferObject* to);
@@ -353,7 +353,7 @@ class OSG_EXPORT GLBufferObjectManager : public osg::Referenced
bool hasSpace(unsigned int size) const { return (_currGLBufferObjectPoolSize+size)<=_maxGLBufferObjectPoolSize; }
bool makeSpace(unsigned int size);
GLBufferObject* generateGLBufferObject(const osg::BufferObject* bufferObject);
osg::ref_ptr<GLBufferObject> generateGLBufferObject(const osg::BufferObject* bufferObject);
void handlePendingOrphandedGLBufferObjects();