Changeset 9447 for OpenSceneGraph/trunk/include/osg/State

Timestamp:

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

Author:

robert

Message:

Added support for primitive instancing

Files:

• OpenSceneGraph/trunk/include/osg/State (modified) (3 diffs)

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;