Changeset 10606 for OpenSceneGraph/trunk/src/osg/BufferObject.cpp

Timestamp:

10/06/09 15:42:12 (4 years ago)

Author:

robert

Message:

Fixed the TextureObject?'s + GLBufferObject reassignment to a new set.

Disabled the unref after apply for a Texture classes when the texture pool is enabled

Files:

• OpenSceneGraph/trunk/src/osg/BufferObject.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osg/BufferObject.cpp

@@ -175 +175 @@
 
         _profile._size = newTotalSize;
+
         if (_set)
         {
-            // remove self from original set
-            _set->remove(this);
-
-            // get the new set for the new profile
-            _set = _set->getParent()->getGLBufferObjectSet(_profile);
-
-            // register self with new set.
-            _set->addToBack(this);
+            _set->moveToSet(this, _set->getParent()->getGLBufferObjectSet(_profile));
         }
 
@@ -883 +877 @@
 
 
+void GLBufferObjectSet::moveToSet(GLBufferObject* to, GLBufferObjectSet* set)
+{
+    if (set==this) return;
+    if (!set) return;
+
+    // remove 'to' from original set
+    --_numOfGLBufferObjects;
+    remove(to);
+
+    // register 'to' with new set.
+    to->_set = set;
+    ++set->_numOfGLBufferObjects;
+    set->addToBack(to);
+}
+
+
+
 GLBufferObjectManager::GLBufferObjectManager(unsigned int contextID):
     _contextID(contextID),