Changeset 7074 for OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowX11.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/GraphicsWindowX11.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowX11.cpp

@@ -19 +19 @@
 #include <osgViewer/api/X11/GraphicsWindowX11>
 #include <osgViewer/api/X11/PixelBufferX11>
+
+#include <osg/DeleteHandler>
 
 #include <X11/Xlib.h>
@@ -1179 +1181 @@
     ~X11WindowingSystemInterface()
     {
+        if (osg::Referenced::getDeleteHandler())
+        {
+            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
+            osg::Referenced::getDeleteHandler()->flushAll();
+        }
+
         //osg::notify(osg::NOTICE)<<"~X11WindowingSystemInterface()"<<std::endl;
         XSetErrorHandler(0);
@@ -1252 +1260 @@
     {
         osg::notify(osg::INFO)<<"~RegisterWindowingSystemInterfaceProxy()"<<std::endl;
+
+        if (osg::Referenced::getDeleteHandler())
+        {
+            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
+            osg::Referenced::getDeleteHandler()->flushAll();
+        }
+
         osg::GraphicsContext::setWindowingSystemInterface(0);
+
     }
 };