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

Timestamp:

10/01/09 22:19:42 (4 years ago)

Author:

robert

Message:

Introduced new BufferObject? design + implementation in preperation of implementing a pool system for buffer objects

Files:

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

OpenSceneGraph/trunk/include/osg/State

@@ -406 +406 @@
 
 
-        void setCurrentVertexBufferObject(osg::VertexBufferObject* vbo) { _currentVBO = vbo; }
-        const VertexBufferObject* getCurrentVertexBufferObject() { return _currentVBO; }
-        inline void bindVertexBufferObject(const osg::VertexBufferObject* vbo)
+        void setCurrentVertexBufferObject(osg::GLBufferObject* vbo) { _currentVBO = vbo; }
+        const GLBufferObject* getCurrentVertexBufferObject() { return _currentVBO; }
+        inline void bindVertexBufferObject(osg::GLBufferObject* vbo)
         {
             if (vbo == _currentVBO) return;
-            if (vbo->isDirty(_contextID)) vbo->compileBuffer(*this);
-            else _glBindBuffer(GL_ARRAY_BUFFER_ARB,vbo->buffer(_contextID));
+            if (vbo->isDirty()) vbo->compileBuffer();
+            else _glBindBuffer(GL_ARRAY_BUFFER_ARB,vbo->getGLObjectID());
             _currentVBO = vbo;
         }
@@ -423 +423 @@
         }
 
-        void setCurrentElementBufferObject(osg::ElementBufferObject* ebo) { _currentEBO = ebo; }
-        const ElementBufferObject* getCurrentElementBufferObject() { return _currentEBO; }
-
-        inline void bindElementBufferObject(const osg::ElementBufferObject* ebo)
+        void setCurrentElementBufferObject(osg::GLBufferObject* ebo) { _currentEBO = ebo; }
+        const GLBufferObject* getCurrentElementBufferObject() { return _currentEBO; }
+
+        inline void bindElementBufferObject(osg::GLBufferObject* ebo)
         {
             if (ebo == _currentEBO) return;
-            if (ebo->isDirty(_contextID)) ebo->compileBuffer(*this);
-            else _glBindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB,ebo->buffer(_contextID));
+            if (ebo->isDirty()) ebo->compileBuffer();
+            else _glBindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB,ebo->getGLObjectID());
             _currentEBO = ebo;
         }
@@ -441 +441 @@
         }
 
-        void setCurrentPixelBufferObject(osg::PixelBufferObject* pbo) { _currentPBO = pbo; }
-        const PixelBufferObject* getCurrentPixelBufferObject() { return _currentPBO; }
-
-        inline void bindPixelBufferObject(const osg::PixelBufferObject* pbo)
+        void setCurrentPixelBufferObject(osg::GLBufferObject* pbo) { _currentPBO = pbo; }
+        const GLBufferObject* getCurrentPixelBufferObject() { return _currentPBO; }
+
+        inline void bindPixelBufferObject(osg::GLBufferObject* pbo)
         {
             if (pbo == _currentPBO) return;
 
-            if (pbo->isDirty(_contextID)) pbo->compileBuffer(*this);
-            else _glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB,pbo->buffer(_contextID));
+            if (pbo->isDirty()) pbo->compileBuffer();
+            else _glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB,pbo->getGLObjectID());
 
             _currentPBO = pbo;
@@ -486 +486 @@
             if (array)
             {
-                const VertexBufferObject* vbo = array->getVertexBufferObject();
+                GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID);
                 if (vbo)
                 {
                     bindVertexBufferObject(vbo);
-                    setVertexPointer(array->getDataSize(),array->getDataType(),0,array->getVertexBufferObjectOffset());
+                    setVertexPointer(array->getDataSize(),array->getDataType(),0,(const GLvoid *)(vbo->getOffset(array->getBufferIndex())));
                 }
                 else
@@ -543 +543 @@
             if (array)
             {
-                const VertexBufferObject* vbo = array->getVertexBufferObject();
+                GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID);
                 if (vbo)
                 {
                     bindVertexBufferObject(vbo);
-                setNormalPointer(array->getDataType(),0,array->getVertexBufferObjectOffset());
+                    setNormalPointer(array->getDataType(),0,(const GLvoid *)(vbo->getOffset(array->getBufferIndex())));
                 }
                 else
@@ -599 +599 @@
             if (array)
             {
-                const VertexBufferObject* vbo = array->getVertexBufferObject();
+                GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID);
                 if (vbo)
                 {
                     bindVertexBufferObject(vbo);
-                    setColorPointer(array->getDataSize(),array->getDataType(),0,array->getVertexBufferObjectOffset());
+                    setColorPointer(array->getDataSize(),array->getDataType(),0,(const GLvoid *)(vbo->getOffset(array->getBufferIndex())));
                 }
                 else
@@ -660 +660 @@
             if (array)
             {
-                const VertexBufferObject* vbo = array->getVertexBufferObject();
+                GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID);
                 if (vbo)
                 {
                     bindVertexBufferObject(vbo);
-#if 0
-                    setSecondaryColorPointer(array->getDataSize(),array->getDataType(),0,vbo->getOffset(array->getVertexBufferObjectIndex()));
-#else
-                    setSecondaryColorPointer(array->getDataSize(),array->getDataType(),0,array->getVertexBufferObjectOffset());
-#endif
+                    setSecondaryColorPointer(array->getDataSize(),array->getDataType(),0,(const GLvoid *)(vbo->getOffset(array->getBufferIndex())));
                 }
                 else
@@ -746 +742 @@
             if (array)
             {
-                const VertexBufferObject* vbo = array->getVertexBufferObject();
+                GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID);
                 if (vbo)
                 {
                     bindVertexBufferObject(vbo);
-#if 0
-                    setFogCoordPointer(array->getDataType(),0,vbo->getOffset(array->getVertexBufferObjectIndex()));
-#else
-                    setFogCoordPointer(array->getDataType(),0,array->getVertexBufferObjectOffset());
-#endif
+                    setFogCoordPointer(array->getDataType(),0,(const GLvoid *)(vbo->getOffset(array->getBufferIndex())));
                 }
                 else
@@ -795 +787 @@
             if (array)
             {
-                const VertexBufferObject* vbo = array->getVertexBufferObject();
+                GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID);
                 if (vbo)
                 {
                     bindVertexBufferObject(vbo);
-#if 0
-                    setTexCoordPointer(unit, array->getDataSize(),array->getDataType(),0,vbo->getOffset(array->getVertexBufferObjectIndex()));
-#else
-                    setTexCoordPointer(unit, array->getDataSize(),array->getDataType(),0,array->getVertexBufferObjectOffset());
-#endif
+                    setTexCoordPointer(unit, array->getDataSize(),array->getDataType(),0, (const GLvoid *)(vbo->getOffset(array->getBufferIndex())));
                 }
                 else
@@ -917 +905 @@
             if (array)
             {
-                const VertexBufferObject* vbo = array->getVertexBufferObject();
+                GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID);
                 if (vbo)
                 {
                     bindVertexBufferObject(vbo);
-#if 0
-                    setVertexAttribPointer(unit, array->getDataSize(),array->getDataType(),normalized,0,vbo->getOffset(array->getVertexBufferObjectIndex()));
-#else
-                    setVertexAttribPointer(unit, array->getDataSize(),array->getDataType(),normalized,0,array->getVertexBufferObjectOffset());
-#endif
+                    setVertexAttribPointer(unit, array->getDataSize(),array->getDataType(),normalized,0,(const GLvoid *)(vbo->getOffset(array->getBufferIndex())));
                 }
                 else
@@ -1280 +1264 @@
         unsigned int                    _currentActiveTextureUnit;
         unsigned int                    _currentClientActiveTextureUnit;
-        const VertexBufferObject*       _currentVBO;
-        const ElementBufferObject*      _currentEBO;
-        const PixelBufferObject*        _currentPBO;
+        GLBufferObject*                 _currentVBO;
+        GLBufferObject*                 _currentEBO;
+        GLBufferObject*                 _currentPBO;