Show
Ignore:
Timestamp:
07/06/07 15:08:51 (7 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowX11.cpp

    r7071 r7074  
    1919#include <osgViewer/api/X11/GraphicsWindowX11> 
    2020#include <osgViewer/api/X11/PixelBufferX11> 
     21 
     22#include <osg/DeleteHandler> 
    2123 
    2224#include <X11/Xlib.h> 
     
    11791181    ~X11WindowingSystemInterface() 
    11801182    { 
     1183        if (osg::Referenced::getDeleteHandler()) 
     1184        { 
     1185            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0); 
     1186            osg::Referenced::getDeleteHandler()->flushAll(); 
     1187        } 
     1188 
    11811189        //osg::notify(osg::NOTICE)<<"~X11WindowingSystemInterface()"<<std::endl; 
    11821190        XSetErrorHandler(0); 
     
    12521260    { 
    12531261        osg::notify(osg::INFO)<<"~RegisterWindowingSystemInterfaceProxy()"<<std::endl; 
     1262 
     1263        if (osg::Referenced::getDeleteHandler()) 
     1264        { 
     1265            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0); 
     1266            osg::Referenced::getDeleteHandler()->flushAll(); 
     1267        } 
     1268 
    12541269        osg::GraphicsContext::setWindowingSystemInterface(0); 
     1270 
    12551271    } 
    12561272};