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

Added support for primitive instancing

Browse Source
This commit is contained in:
Robert Osfield
2009-01-06 14:55:49 +00:00
parent 9bd7fa7e6e
commit 4f3b1baee4
7 changed files with 158 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/osg/PrimitiveSet
View File

@@ -175,8 +175,9 @@ class OSG_EXPORT PrimitiveSet : public Object
POLYGON = GL_POLYGON
};
PrimitiveSet(Type primType=PrimitiveType,GLenum mode=0):
PrimitiveSet(Type primType=PrimitiveType,GLenum mode=0, int numInstances=0):
_primitiveType(primType),
_numInstances(numInstances),
_mode(mode),
_modifiedCount(0),
_rangeModifiedCount(0) {}
@@ -184,6 +185,7 @@ class OSG_EXPORT PrimitiveSet : public Object
PrimitiveSet(const PrimitiveSet& prim,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
Object(prim,copyop),
_primitiveType(prim._primitiveType),
_numInstances(prim._numInstances),
_mode(prim._mode),
_modifiedCount(0),
_rangeModifiedCount(0) {}
@@ -200,6 +202,9 @@ class OSG_EXPORT PrimitiveSet : public Object
virtual DrawElements* getDrawElements() { return 0; }
virtual const DrawElements* getDrawElements() const { return 0; }
void setNumInstances(int n) { _numInstances = n; }
int getNumInstances() const { return _numInstances; }
void setMode(GLenum mode) { _mode = mode; }
GLenum getMode() const { return _mode; }
@@ -238,6 +243,7 @@ class OSG_EXPORT PrimitiveSet : public Object
virtual ~PrimitiveSet() {}
Type _primitiveType;
int _numInstances;
GLenum _mode;
unsigned int _modifiedCount;
mutable unsigned int _rangeModifiedCount;
@@ -275,8 +281,8 @@ class OSG_EXPORT DrawArrays : public PrimitiveSet
_first(0),
_count(0) {}
DrawArrays(GLenum mode, GLint first, GLsizei count):
PrimitiveSet(DrawArraysPrimitiveType,mode),
DrawArrays(GLenum mode, GLint first, GLsizei count, int numInstances=0):
PrimitiveSet(DrawArraysPrimitiveType, mode, numInstances),
_first(first),
_count(count) {}
@@ -385,8 +391,8 @@ class DrawElements : public PrimitiveSet
{
public:
DrawElements(Type primType=PrimitiveType, GLenum mode=0):
PrimitiveSet(primType,mode),
DrawElements(Type primType=PrimitiveType, GLenum mode=0, int numInstances=0):
PrimitiveSet(primType,mode, numInstances),
_eboOffset(0) {}
DrawElements(const DrawElements& copy,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
@@ -472,8 +478,8 @@ class OSG_EXPORT DrawElementsUByte : public DrawElements, public VectorGLubyte
DrawElements(array,copyop),
vector_type(array) {}
DrawElementsUByte(GLenum mode, unsigned int no, const GLubyte* ptr) :
DrawElements(DrawElementsUBytePrimitiveType,mode),
DrawElementsUByte(GLenum mode, unsigned int no, const GLubyte* ptr, int numInstances=0) :
DrawElements(DrawElementsUBytePrimitiveType,mode,numInstances),
vector_type(ptr,ptr+no) {}
DrawElementsUByte(GLenum mode, unsigned int no) :
@@ -542,8 +548,8 @@ class OSG_EXPORT DrawElementsUShort : public DrawElements, public VectorGLushort
DrawElements(array,copyop),
vector_type(array) {}
DrawElementsUShort(GLenum mode, unsigned int no, const GLushort* ptr) :
DrawElements(DrawElementsUShortPrimitiveType,mode),
DrawElementsUShort(GLenum mode, unsigned int no, const GLushort* ptr, int numInstances=0) :
DrawElements(DrawElementsUShortPrimitiveType,mode,numInstances),
vector_type(ptr,ptr+no) {}
DrawElementsUShort(GLenum mode, unsigned int no) :
@@ -616,8 +622,8 @@ class OSG_EXPORT DrawElementsUInt : public DrawElements, public VectorGLuint
DrawElements(array,copyop),
vector_type(array) {}
DrawElementsUInt(GLenum mode, unsigned int no, const GLuint* ptr) :
DrawElements(DrawElementsUIntPrimitiveType,mode),
DrawElementsUInt(GLenum mode, unsigned int no, const GLuint* ptr, int numInstances=0) :
DrawElements(DrawElementsUIntPrimitiveType,mode,numInstances),
vector_type(ptr,ptr+no) {}
DrawElementsUInt(GLenum mode, unsigned int no) :

21
include/osg/State
View File

@@ -459,6 +459,20 @@ class OSG_EXPORT State : public Referenced
_glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB,0);
_currentPBO = 0;
}
inline void glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei primcount)
{
if (primcount>=1 && _glDrawArraysInstanced!=0) _glDrawArraysInstanced(mode, first, count, primcount);
else glDrawArrays(mode, first, count);
}
inline void glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount )
{
if (primcount>=1 && _glDrawElementsInstanced!=0) _glDrawElementsInstanced(mode, count, type, indices, primcount);
else glDrawElements(mode, count, type, indices);
}
/** Wrapper around glInterleavedArrays(..).
* also resets the internal array points and modes within osg::State to keep the other
@@ -1293,7 +1307,9 @@ class OSG_EXPORT State : public Referenced
typedef void (APIENTRY * EnableVertexAttribProc) (unsigned int);
typedef void (APIENTRY * DisableVertexAttribProc) (unsigned int);
typedef void (APIENTRY * BindBufferProc) (GLenum target, GLuint buffer);
typedef void (APIENTRY * DrawArraysInstancedProc)( GLenum mode, GLint first, GLsizei count, GLsizei primcount );
typedef void (APIENTRY * DrawElementsInstancedProc)( GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount );
bool _extensionProcsInitialized;
GLint _glMaxTextureCoords;
@@ -1306,7 +1322,8 @@ class OSG_EXPORT State : public Referenced
EnableVertexAttribProc _glEnableVertexAttribArray;
DisableVertexAttribProc _glDisableVertexAttribArray;
BindBufferProc _glBindBuffer;
DrawArraysInstancedProc _glDrawArraysInstanced;
DrawElementsInstancedProc _glDrawElementsInstanced;
unsigned int _dynamicObjectCount;
osg::ref_ptr<DynamicObjectRenderingCompletedCallback> _completeDynamicObjectRenderingCallback;