Changeset 9447

Timestamp:

01/06/09 15:55:49 (4 years ago)

Author:

robert

Message:

Added support for primitive instancing

Location:

OpenSceneGraph/trunk

Files:

• include/osg/PrimitiveSet (modified) (9 diffs)
• include/osg/State (modified) (3 diffs)
• src/osg/PrimitiveSet.cpp (modified) (4 diffs)
• src/osg/State.cpp (modified) (2 diffs)
• src/osgPlugins/ive/IveVersion.h (modified) (1 diff)
• src/osgPlugins/ive/PrimitiveSet.cpp (modified) (2 diffs)
• src/osgPlugins/osg/Geometry.cpp (modified) (14 diffs)

OpenSceneGraph/trunk/include/osg/PrimitiveSet

@@ -176 +176 @@
         };
 
-        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),
@@ -185 +186 @@
             Object(prim,copyop),
             _primitiveType(prim._primitiveType),
+            _numInstances(prim._numInstances),
             _mode(prim._mode),
             _modifiedCount(0),
@@ -201 +203 @@
         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; }
@@ -239 +244 @@
 
         Type            _primitiveType;
+        int             _numInstances;
         GLenum          _mode;
         unsigned int    _modifiedCount;
@@ -276 +282 @@
             _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) {}
@@ -386 +392 @@
     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) {}
     
@@ -473 +479 @@
             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) {}
 
@@ -543 +549 @@
             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) {}
 
@@ -617 +623 @@
             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) {}
 

OpenSceneGraph/trunk/include/osg/State

@@ -460 +460 @@
             _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(..).
@@ -1294 +1308 @@
         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;
@@ -1307 +1323 @@
         DisableVertexAttribProc     _glDisableVertexAttribArray;
         BindBufferProc              _glBindBuffer;
-
+        DrawArraysInstancedProc     _glDrawArraysInstanced;
+        DrawElementsInstancedProc   _glDrawElementsInstanced;
 
         unsigned int                                            _dynamicObjectCount;

OpenSceneGraph/trunk/src/osg/PrimitiveSet.cpp

@@ -36 +36 @@
 }
 
-void DrawArrays::draw(State&, bool) const 
-{
-    glDrawArrays(_mode,_first,_count);
+void DrawArrays::draw(State& state, bool) const 
+{
+    if (_numInstances>=1) state.glDrawArraysInstanced(_mode,_first,_count, _numInstances);
+    else glDrawArrays(_mode,_first,_count);
 }
 
@@ -130 +131 @@
         if (ebo)
         {
-            glDrawElements(_mode, size(), GL_UNSIGNED_BYTE, getElementBufferObjectOffset());
+            if (_numInstances>=1) state.glDrawElementsInstanced(_mode, size(), GL_UNSIGNED_BYTE, getElementBufferObjectOffset(), _numInstances);
+            else glDrawElements(_mode, size(), GL_UNSIGNED_BYTE, getElementBufferObjectOffset());
         }
         else
         {
-            glDrawElements(_mode, size(), GL_UNSIGNED_BYTE, &front());
+            if (_numInstances>=1) state.glDrawElementsInstanced(_mode, size(), GL_UNSIGNED_BYTE, &front(), _numInstances);
+            else glDrawElements(_mode, size(), GL_UNSIGNED_BYTE, &front());
         }
     }
     else 
     {
-        glDrawElements(_mode, size(), GL_UNSIGNED_BYTE, &front());
+        if (_numInstances>=1) state.glDrawElementsInstanced(_mode, size(), GL_UNSIGNED_BYTE, &front(), _numInstances);
+        else glDrawElements(_mode, size(), GL_UNSIGNED_BYTE, &front());
     }
 }
@@ -177 +181 @@
         if (ebo)
         {
-            glDrawElements(_mode, size(), GL_UNSIGNED_SHORT, getElementBufferObjectOffset());
+            if (_numInstances>=1) state.glDrawElementsInstanced(_mode, size(), GL_UNSIGNED_BYTE, getElementBufferObjectOffset(), _numInstances);
+            else glDrawElements(_mode, size(), GL_UNSIGNED_SHORT, getElementBufferObjectOffset());
         }
         else
         {
-            glDrawElements(_mode, size(), GL_UNSIGNED_SHORT, &front());
+            if (_numInstances>=1) state.glDrawElementsInstanced(_mode, size(), GL_UNSIGNED_BYTE, &front(), _numInstances);
+            else glDrawElements(_mode, size(), GL_UNSIGNED_SHORT, &front());
         }
     }
     else 
     {
-        glDrawElements(_mode, size(), GL_UNSIGNED_SHORT, &front());
+        if (_numInstances>=1) state.glDrawElementsInstanced(_mode, size(), GL_UNSIGNED_BYTE, &front(), _numInstances);
+        else glDrawElements(_mode, size(), GL_UNSIGNED_SHORT, &front());
     }
 }
@@ -224 +231 @@
         if (ebo)
         {
-            glDrawElements(_mode, size(), GL_UNSIGNED_INT, getElementBufferObjectOffset());
+            if (_numInstances>=1) state.glDrawElementsInstanced(_mode, size(), GL_UNSIGNED_BYTE, getElementBufferObjectOffset(), _numInstances);
+            else glDrawElements(_mode, size(), GL_UNSIGNED_INT, getElementBufferObjectOffset());
         }
         else
         {
-            glDrawElements(_mode, size(), GL_UNSIGNED_INT, &front());
+            if (_numInstances>=1) state.glDrawElementsInstanced(_mode, size(), GL_UNSIGNED_BYTE, &front(), _numInstances);
+            else glDrawElements(_mode, size(), GL_UNSIGNED_INT, &front());
         }
     }
     else 
     {
-        glDrawElements(_mode, size(), GL_UNSIGNED_INT, &front());
+        if (_numInstances>=1) state.glDrawElementsInstanced(_mode, size(), GL_UNSIGNED_BYTE, &front(), _numInstances);
+        else glDrawElements(_mode, size(), GL_UNSIGNED_INT, &front());
     }
 }

OpenSceneGraph/trunk/src/osg/State.cpp

@@ -80 +80 @@
     _glEnableVertexAttribArray = 0;
     _glDisableVertexAttribArray = 0;
+    _glDrawArraysInstanced = 0;
+    _glDrawElementsInstanced = 0;
 
     _dynamicObjectCount  = 0;
@@ -755 +757 @@
     setGLExtensionFuncPtr(_glBindBuffer, "glBindBuffer","glBindBufferARB");
 
+    setGLExtensionFuncPtr(_glDrawArraysInstanced, "glDrawArraysInstanced","glDrawArraysInstancedEXT");
+    setGLExtensionFuncPtr(_glDrawElementsInstanced, "glDrawElementsInstanced","glDrawElementsInstancedEXT");
+
     if ( osg::getGLVersionNumber() >= 2.0 || osg::isGLExtensionSupported(_contextID,"GL_ARB_vertex_shader") )
     {

OpenSceneGraph/trunk/src/osgPlugins/ive/IveVersion.h

@@ -47 +47 @@
 #define VERSION_0036 36
 #define VERSION_0037 37
+#define VERSION_0038 38
 
-#define VERSION VERSION_0037
+#define VERSION VERSION_0038
 
 /* The BYTE_SEX tag is used to check the endian

OpenSceneGraph/trunk/src/osgPlugins/ive/PrimitiveSet.cpp

@@ -31 +31 @@
 
 
+    if ( out->getVersion() >= VERSION_0038 )
+    {
+        out->writeInt(getNumInstances());
+    }
+ 
     // Write PrimitiveSet's properties.
     out->writeInt(getMode());
@@ -50 +55 @@
 
 
+        if ( in->getVersion() >= VERSION_0038 )
+        {
+            setNumInstances(in->readInt());
+        }
+
         // Read in primitiveset properties.
         setMode(in->readInt());

OpenSceneGraph/trunk/src/osgPlugins/osg/Geometry.cpp

@@ -1004 +1004 @@
 {
     bool iteratorAdvanced = false;
-    if (fr.matchSequence("DrawArrays %w %i %i"))
+    bool firstMatched = false;
+    if ((firstMatched = fr.matchSequence("DrawArrays %w %i %i %i")) || 
+         fr.matchSequence("DrawArrays %w %i %i") )
     {
         
@@ -1016 +1018 @@
         fr[3].getInt(count);
 
-        geom.addPrimitiveSet(new DrawArrays(mode,first,count));
-
-        fr += 4;
-        
-        iteratorAdvanced = true;
-        
-    }
-    else if (fr.matchSequence("DrawArrayLengths %w %i %i {"))
+        int numInstances = 0;
+        if (firstMatched)
+        {
+            fr[4].getInt(numInstances);
+            fr += 5;
+        }
+        else
+        {
+            fr += 4;
+        }
+
+        geom.addPrimitiveSet(new DrawArrays(mode, first, count, numInstances));
+
+        
+        iteratorAdvanced = true;
+        
+    }
+    else if ((firstMatched = fr.matchSequence("DrawArrayLengths %w %i %i %i {")) || 
+         fr.matchSequence("DrawArrayLengths %w %i %i {") )
     {
         int entry = fr[1].getNoNestedBrackets();
@@ -1036 +1049 @@
         fr[3].getInt(capacity);
         
-        fr += 5;
-        
+        int numInstances = 0;
+        if (firstMatched)
+        {
+            fr[4].getInt(numInstances);
+            fr += 6;
+        }
+        else
+        {
+            fr += 5;
+        }
+
         DrawArrayLengths* prim = new DrawArrayLengths;
         prim->setMode(mode);
+        prim->setNumInstances(numInstances);
         prim->setFirst(first);
         prim->reserve(capacity);
@@ -1058 +1081 @@
         iteratorAdvanced = true;
     }
-    else if (fr.matchSequence("DrawElementsUByte %w %i {"))
+    else if ((firstMatched = fr.matchSequence("DrawElementsUByte %w %i %i {")) || 
+         fr.matchSequence("DrawElementsUByte %w %i {"))
     {
         int entry = fr[1].getNoNestedBrackets();
@@ -1068 +1092 @@
         fr[2].getInt(capacity);
         
-        fr += 4;
-        
+        int numInstances = 0;
+        if (firstMatched)
+        {
+            fr[3].getInt(numInstances);
+            fr += 5;
+        }
+        else
+        {
+            fr += 4;
+        }
+
         DrawElementsUByte* prim = new DrawElementsUByte;
         prim->setMode(mode);
+        prim->setNumInstances(numInstances);
         prim->reserve(capacity);
 
@@ -1089 +1123 @@
         iteratorAdvanced = true;
     }
-    else if (fr.matchSequence("DrawElementsUShort %w %i {"))
+    else if ((firstMatched = fr.matchSequence("DrawElementsUShort %w %i %i {")) || 
+         fr.matchSequence("DrawElementsUShort %w %i {"))
     {
         int entry = fr[1].getNoNestedBrackets();
@@ -1099 +1134 @@
         fr[2].getInt(capacity);
         
-        fr += 4;
+        int numInstances = 0;
+        if (firstMatched)
+        {
+            fr[3].getInt(numInstances);
+            fr += 5;
+        }
+        else
+        {
+            fr += 4;
+        }
         
         DrawElementsUShort* prim = new DrawElementsUShort;
         prim->setMode(mode);
+        prim->setNumInstances(numInstances);
         prim->reserve(capacity);
 
@@ -1120 +1165 @@
         iteratorAdvanced = true;
     }
-    else if (fr.matchSequence("DrawElementsUInt %w %i {"))
+    else if ((firstMatched = fr.matchSequence("DrawElementsUInt %w %i %i {")) || 
+              fr.matchSequence("DrawElementsUInt %w %i {"))
     {
         int entry = fr[1].getNoNestedBrackets();
@@ -1130 +1176 @@
         fr[2].getInt(capacity);
         
-        fr += 4;
+        int numInstances = 0;
+        if (firstMatched)
+        {
+            fr[3].getInt(numInstances);
+            fr += 5;
+        }
+        else
+        {
+            fr += 4;
+        }
         
         DrawElementsUInt* prim = new DrawElementsUInt;
         prim->setMode(mode);
+        prim->setNumInstances(numInstances);
         prim->reserve(capacity);
 
@@ -1163 +1219 @@
             {
                 const DrawArrays& cprim = static_cast<const DrawArrays&>(prim);
-                fw<<cprim.className()<<" "<<Geometry_getPrimitiveModeStr(cprim.getMode())<<" "<<cprim.getFirst()<<" "<<cprim.getCount()<<std::endl;
+                fw<<cprim.className()<<" "<<Geometry_getPrimitiveModeStr(cprim.getMode())<<" "<<cprim.getFirst()<<" "<<cprim.getCount();
+                if (prim.getNumInstances()>0) fw<<" "<<prim.getNumInstances();
+                fw<<std::endl;
                 return true;
             }
@@ -1170 +1228 @@
             {
                 const DrawArrayLengths& cprim = static_cast<const DrawArrayLengths&>(prim);
-                fw<<cprim.className()<<" "<<Geometry_getPrimitiveModeStr(cprim.getMode())<<" "<<cprim.getFirst()<<" "<<cprim.size()<<std::endl;
+                fw<<cprim.className()<<" "<<Geometry_getPrimitiveModeStr(cprim.getMode())<<" "<<cprim.getFirst()<<" "<<cprim.size();
+                if (prim.getNumInstances()>0) fw<<" "<<prim.getNumInstances();
+                fw<<std::endl;
                 writeArray(fw,cprim.begin(),cprim.end());
                 return true;
@@ -1178 +1238 @@
             {
                 const DrawElementsUByte& cprim = static_cast<const DrawElementsUByte&>(prim);
-                fw<<cprim.className()<<" "<<Geometry_getPrimitiveModeStr(cprim.getMode())<<" "<<cprim.size()<<std::endl;
+                fw<<cprim.className()<<" "<<Geometry_getPrimitiveModeStr(cprim.getMode())<<" "<<cprim.size();
+                if (prim.getNumInstances()>0) fw<<" "<<prim.getNumInstances();
+                fw<<std::endl;
                 writeArrayAsInts(fw,cprim.begin(),cprim.end());
                 return true;
@@ -1186 +1248 @@
             {
                 const DrawElementsUShort& cprim = static_cast<const DrawElementsUShort&>(prim);
-                fw<<cprim.className()<<" "<<Geometry_getPrimitiveModeStr(cprim.getMode())<<" "<<cprim.size()<<std::endl;
+                fw<<cprim.className()<<" "<<Geometry_getPrimitiveModeStr(cprim.getMode())<<" "<<cprim.size();
+                if (prim.getNumInstances()>0) fw<<" "<<prim.getNumInstances();
+                fw<<std::endl;
                 writeArray(fw,cprim.begin(),cprim.end());
                 return true;
@@ -1194 +1258 @@
             {
                 const DrawElementsUInt& cprim = static_cast<const DrawElementsUInt&>(prim);
-                fw<<cprim.className()<<" "<<Geometry_getPrimitiveModeStr(cprim.getMode())<<" "<<cprim.size()<<std::endl;
+                fw<<cprim.className()<<" "<<Geometry_getPrimitiveModeStr(cprim.getMode())<<" "<<cprim.size();
+                if (prim.getNumInstances()>0) fw<<" "<<prim.getNumInstances();
+                fw<<std::endl;
                 writeArray(fw,cprim.begin(),cprim.end());
                 return true;