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

From Lionel Lagarde, "Support for paging and shared PBO"

Browse Source 
"The attached file contains:
- a per-context read counter in GLBufferObject::BufferEntry
- a global client counter in BufferData
- the glue between Texture* and Image client counter
"
This commit is contained in:
Robert Osfield
2013-06-27 16:44:32 +00:00
parent 57947ea75c
commit 9f13e2fcb9
10 changed files with 180 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/osg/BufferObject
View File

@@ -194,9 +194,10 @@ class OSG_EXPORT GLBufferObject : public Referenced
struct BufferEntry
{
BufferEntry(): modifiedCount(0),dataSize(0),offset(0),dataSource(0) {}
BufferEntry(): numRead(0), modifiedCount(0),dataSize(0),offset(0),dataSource(0) {}
BufferEntry(const BufferEntry& rhs):
numRead(rhs.numRead),
modifiedCount(rhs.modifiedCount),
dataSize(rhs.dataSize),
offset(rhs.offset),
@@ -205,6 +206,7 @@ class OSG_EXPORT GLBufferObject : public Referenced
BufferEntry& operator = (const BufferEntry& rhs)
{
if (&rhs==this) return *this;
numRead = rhs.numRead;
modifiedCount = rhs.modifiedCount;
dataSize = rhs.dataSize;
offset = rhs.offset;
@@ -212,6 +214,9 @@ class OSG_EXPORT GLBufferObject : public Referenced
return *this;
}
unsigned int getNumClients() const;
unsigned int numRead;
unsigned int modifiedCount;
unsigned int dataSize;
unsigned int offset;
@@ -339,6 +344,10 @@ class OSG_EXPORT GLBufferObject : public Referenced
* but need to ensure that they all use the same low common denominator extensions.*/
static void setExtensions(unsigned int contextID,Extensions* extensions);
bool hasAllBufferDataBeenRead() const;
void setBufferDataHasBeenRead(const osg::BufferData* bd);
protected:
virtual ~GLBufferObject();
@@ -610,14 +619,16 @@ class OSG_EXPORT BufferData : public Object
BufferData():
Object(true),
_modifiedCount(0),
_bufferIndex(0) {}
_bufferIndex(0),
_numClients(0) {}
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
BufferData(const BufferData& bd,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
osg::Object(bd,copyop),
_modifiedCount(0),
_bufferIndex(0),
_modifiedCallback(bd._modifiedCallback) {}
_modifiedCallback(bd._modifiedCallback),
_numClients(0) {}
virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast<const BufferData*>(obj)!=NULL; }
virtual const char* libraryName() const { return "osg"; }
@@ -683,6 +694,12 @@ class OSG_EXPORT BufferData : public Object
* for all graphics contexts. */
void releaseGLObjects(State* state=0) const;
unsigned int getNumClients() const { return _numClients; }
void addClient(osg::Object *client) { ++_numClients; }
void removeClient(osg::Object *client) { --_numClients; }
protected:
virtual ~BufferData();
@@ -692,6 +709,8 @@ protected:
unsigned int _bufferIndex;
osg::ref_ptr<BufferObject> _bufferObject;
osg::ref_ptr<ModifiedCallback> _modifiedCallback;
unsigned int _numClients;
};