Changeset 7074 for OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

Timestamp:

07/06/07 15:08:51 (6 years ago)

Author:

robert

Message:

Added include/osg/GLObjects + .cpp which provide osg::flush*DeletedGLObjects() methods.

Added and cleaned up DeleteHandler? calls in osgViewer to help avoid crashes on exit.

Changed DatabasePager? across to dynamically checcking osg::getCompileContext(..)

Updated wrappers.

Files:

• OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

@@ -344 +344 @@
     
     /** dtor */
-    ~OSXCarbonWindowingSystemInterface() {
-        if (_displayIds)
-            delete[] _displayIds;
+    ~OSXCarbonWindowingSystemInterface()
+    {
+        if (osg::Referenced::getDeleteHandler())
+        {
+            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
+            osg::Referenced::getDeleteHandler()->flushAll();
+        }
+
+        if (_displayIds) delete[] _displayIds;
         _displayIds = NULL;
     }
@@ -1135 +1141 @@
     ~RegisterWindowingSystemInterfaceProxy()
     {
+        if (osg::Referenced::getDeleteHandler())
+        {
+            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
+            osg::Referenced::getDeleteHandler()->flushAll();
+        }
+
         osg::GraphicsContext::setWindowingSystemInterface(0);
     }