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

Added GLBufferObject::computeBufferAlignment(..) method to enable buffer entries to be aligned along specified buffer alignment boundaries, currently defaulting to 4.

Browse Source
This commit is contained in:
Robert Osfield
2011-06-14 10:15:12 +00:00
parent 529ea4c94f
commit 6a6c5bccda
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/osg/BufferObject
View File

@@ -334,6 +334,13 @@ class OSG_EXPORT GLBufferObject : public Referenced
virtual ~GLBufferObject();
unsigned int computeBufferAlignment(unsigned int pos, unsigned int bufferAlignment) const
{
if (bufferAlignment<2) return pos;
if ((pos%bufferAlignment)==0) return pos;
return ((pos/bufferAlignment)+1)*bufferAlignment;
}
unsigned int _contextID;
GLuint _glObjectID;

10
src/osg/BufferObject.cpp
View File

@@ -110,6 +110,8 @@ void GLBufferObject::compileBuffer()
bool compileAll = false;
bool offsetChanged = false;
unsigned int bufferAlignment = 4;
unsigned int newTotalSize = 0;
unsigned int i=0;
for(; i<_bufferObject->getNumBufferData(); ++i)
@@ -122,7 +124,7 @@ void GLBufferObject::compileBuffer()
entry.dataSource != bd ||
entry.dataSize != bd->getTotalDataSize())
{
unsigned int previousEndOfBufferDataMarker = entry.offset + entry.dataSize;
unsigned int previousEndOfBufferDataMarker = computeBufferAlignment(entry.offset + entry.dataSize, bufferAlignment);
// OSG_NOTICE<<"GLBufferObject::compileBuffer(..) updating BufferEntry"<<std::endl;
@@ -139,7 +141,9 @@ void GLBufferObject::compileBuffer()
}
}
else
newTotalSize += entry.dataSize;
{
newTotalSize = computeBufferAlignment(newTotalSize + entry.dataSize, bufferAlignment);
}
}
else
{
@@ -155,7 +159,7 @@ void GLBufferObject::compileBuffer()
OSG_NOTICE<<" dataSource "<<entry.dataSource<<std::endl;
OSG_NOTICE<<" modifiedCount "<<entry.modifiedCount<<std::endl;
#endif
newTotalSize += entry.dataSize;
newTotalSize = computeBufferAlignment(newTotalSize + entry.dataSize, bufferAlignment);
_bufferEntries.push_back(entry);
}