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

Fixed the GLBufferObject size computation so that it takes into account padding.

Browse Source
This commit is contained in:
Robert Osfield
2018-04-19 19:41:51 +01:00
parent bf6db4eee7
commit f95fdd4d4e
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/osg/BufferObject
View File

@@ -152,6 +152,14 @@ class BufferObjectProfile
class GLBufferObjectSet; class GLBufferObjectSet;
class GLBufferObjectManager; class GLBufferObjectManager;
inline unsigned int computeBufferAlignment(unsigned int pos, unsigned int bufferAlignment)
{
if (bufferAlignment<2) return pos;
if ((pos%bufferAlignment)==0) return pos;
return ((pos/bufferAlignment)+1)*bufferAlignment;
}
class OSG_EXPORT GLBufferObject : public GraphicsObject class OSG_EXPORT GLBufferObject : public GraphicsObject
{ {
public: public:
@@ -235,9 +243,7 @@ class OSG_EXPORT GLBufferObject : public GraphicsObject
unsigned int computeBufferAlignment(unsigned int pos, unsigned int bufferAlignment) const unsigned int computeBufferAlignment(unsigned int pos, unsigned int bufferAlignment) const
{ {
if (bufferAlignment<2) return pos; return osg::computeBufferAlignment(pos, bufferAlignment);
if ((pos%bufferAlignment)==0) return pos;
return ((pos/bufferAlignment)+1)*bufferAlignment;
} }
unsigned int _contextID; unsigned int _contextID;

7
src/osg/BufferObject.cpp
View File

@@ -140,7 +140,7 @@ void GLBufferObject::compileBuffer()
entry.dataSource != bd || entry.dataSource != bd ||
entry.dataSize != bd->getTotalDataSize()) entry.dataSize != bd->getTotalDataSize())
{ {
unsigned int previousEndOfBufferDataMarker = computeBufferAlignment(entry.offset + entry.dataSize, bufferAlignment); unsigned int previousEndOfBufferDataMarker = osg::computeBufferAlignment(entry.offset + entry.dataSize, bufferAlignment);
// OSG_NOTICE<<"GLBufferObject::compileBuffer(..) updating BufferEntry"<<std::endl; // OSG_NOTICE<<"GLBufferObject::compileBuffer(..) updating BufferEntry"<<std::endl;
@@ -158,7 +158,7 @@ void GLBufferObject::compileBuffer()
} }
else else
{ {
newTotalSize = computeBufferAlignment(newTotalSize + entry.dataSize, bufferAlignment); newTotalSize = osg::computeBufferAlignment(newTotalSize + entry.dataSize, bufferAlignment);
} }
} }
else else
@@ -1188,13 +1188,14 @@ void BufferObject::removeBufferData(BufferData* bd)
unsigned int BufferObject::computeRequiredBufferSize() const unsigned int BufferObject::computeRequiredBufferSize() const
{ {
unsigned int bufferAlignment = 4;
unsigned int newTotalSize = 0; unsigned int newTotalSize = 0;
for(BufferDataList::const_iterator itr = _bufferDataList.begin(); for(BufferDataList::const_iterator itr = _bufferDataList.begin();
itr != _bufferDataList.end(); itr != _bufferDataList.end();
++itr) ++itr)
{ {
BufferData* bd = *itr; BufferData* bd = *itr;
if (bd) newTotalSize += bd->getTotalDataSize(); if (bd) newTotalSize = osg::computeBufferAlignment(newTotalSize + bd->getTotalDataSize(), bufferAlignment);
else else
{ {
OSG_NOTICE<<"BufferObject::"<<this<<":"<<className()<<"::BufferObject::computeRequiredBufferSize() error, BufferData is 0x0"<<std::endl; OSG_NOTICE<<"BufferObject::"<<this<<":"<<className()<<"::BufferObject::computeRequiredBufferSize() error, BufferData is 0x0"<<std::endl;