From 39c0c2df760a2bcd2f35f2d04ddd921909341673 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 24 Dec 2006 16:40:19 +0000
Subject: [PATCH] Unified the osg::GraphicsThread::Operation and
 osg::GraphicsContext::Operation classes as osg::GraphicsOperation.  Unpdated
 parts of OSG depending upon these.

Added a virtaul bool valid() method to osg::GraphicsContext to allow apps to
test whether a valid graphis context has been created or not.
---
 examples/osgcamera/osgcamera.cpp    |  3 +-
 include/osg/GraphicsContext         | 49 +++++------------
 include/osg/GraphicsThread          | 82 +++++++++++++++--------------
 include/osgViewer/GraphicsWindowX11 | 13 ++++-
 src/osg/GraphicsContext.cpp         |  4 +-
 src/osg/GraphicsThread.cpp          |  8 +--
 src/osgUtil/RenderStage.cpp         |  4 +-
 src/osgViewer/GraphicsWindowX11.cpp | 76 +++++++++++++++++++-------
 src/osgViewer/View.cpp              |  4 +-
 src/osgViewer/Viewer.cpp            |  8 +--
 10 files changed, 139 insertions(+), 112 deletions(-)

diff --git a/examples/osgcamera/osgcamera.cpp b/examples/osgcamera/osgcamera.cpp
index 24388bd45..ec3a54b6b 100644
--- a/examples/osgcamera/osgcamera.cpp
+++ b/examples/osgcamera/osgcamera.cpp
@@ -39,10 +39,11 @@ int main( int argc, char **argv )
     viewer.setUpViewAcrossAllScreens();
     viewer.realize();
 
+    bool limitNumberOfFrames = false;
     unsigned int numFrames = 0;
     unsigned int maxFrames = 100;
 
-    while(!viewer.done() && numFrames<maxFrames)
+    while(!viewer.done() && !(limitNumberOfFrames && numFrames>=maxFrames))
     {
         viewer.frame();
         ++numFrames;
diff --git a/include/osg/GraphicsContext b/include/osg/GraphicsContext
index 911b36a2e..b494c60a4 100644
--- a/include/osg/GraphicsContext
+++ b/include/osg/GraphicsContext
@@ -146,40 +146,11 @@ class OSG_EXPORT GraphicsContext : public Referenced
     
     public:
     
-        /** Base class for implementing graphics operations.*/
-        struct OSG_EXPORT Operation : virtual public Referenced
-        {
-            Operation(const std::string& name, bool keep):
-                _name(name),
-                _keep(keep) {}
-                
-            /** Set the human readable name of the operation.*/
-            void setName(const std::string& name) { _name = name; }
-
-            /** Get the human readable name of the operation.*/
-            const std::string& getName() const { return _name; }
-        
-            /** Set whether the operation should be kept once its been applied.*/ 
-            void setKeep(bool keep) { _keep = keep; }
-
-            /** Get whether the operation should be kept once its been applied.*/ 
-            bool getKeep() const { return _keep; }
-
-            /** if this operation is a barrier then release it.*/
-            virtual void release() {}
-
-            /** Do the actual task of this operation.*/ 
-            virtual void operator () (GraphicsContext*) {}
-            
-            std::string _name;
-            bool        _keep;
-        };
-        
         /** Add operation to end of OperationQueue.*/
-        void add(Operation* operation);
+        void add(GraphicsOperation* operation);
         
         /** Remove operation from OperationQueue.*/
-        void remove(Operation* operation);
+        void remove(GraphicsOperation* operation);
 
         /** Remove named operation from OperationQueue.*/
         void remove(const std::string& name);
@@ -206,6 +177,9 @@ class OSG_EXPORT GraphicsContext : public Referenced
         inline const State* getState() const { return _state.get(); }
         
 
+        /** Return whether a valid and usable GraphicsContext has been created.*/
+        virtual bool valid() const { return false; }
+
         /** Realise the GraphicsContext.*/
         bool realize();
 
@@ -296,13 +270,14 @@ class OSG_EXPORT GraphicsContext : public Referenced
         OpenThreads::Mutex      _mutex;
         OpenThreads::Thread*    _threadOfLastMakeCurrent;
         
-        typedef std::list< ref_ptr<Operation> > OperationQueue;
-        OpenThreads::Mutex          _operationsMutex;
-        osg::ref_ptr<osg::Block>    _operationsBlock;
-        OperationQueue              _operations;
-        osg::ref_ptr<Operation>     _currentOperation;
+        typedef std::list< ref_ptr<GraphicsOperation> > OperationQueue;
+        
+        OpenThreads::Mutex                  _operationsMutex;
+        osg::ref_ptr<osg::Block>            _operationsBlock;
+        OperationQueue                      _operations;
+        osg::ref_ptr<GraphicsOperation>     _currentOperation;
 
-        ref_ptr<GraphicsThread> _graphicsThread;
+        ref_ptr<GraphicsThread>             _graphicsThread;
         
 };
 
diff --git a/include/osg/GraphicsThread b/include/osg/GraphicsThread
index 7555ee766..0d7d37987 100644
--- a/include/osg/GraphicsThread
+++ b/include/osg/GraphicsThread
@@ -75,47 +75,50 @@ class Block: virtual public osg::Referenced {
         bool _released;
 };
 
+/** Base class for implementing graphics operations.*/
+struct GraphicsOperation : virtual public Referenced
+{
+    GraphicsOperation(const std::string& name, bool keep):
+        _name(name),
+        _keep(keep) {}
+        
+    virtual ~GraphicsOperation() {}
+
+    /** Set the human readable name of the operation.*/
+    void setName(const std::string& name) { _name = name; }
+
+    /** Get the human readable name of the operation.*/
+    const std::string& getName() const { return _name; }
+
+    /** Set whether the operation should be kept once its been applied.*/ 
+    void setKeep(bool keep) { _keep = keep; }
+
+    /** Get whether the operation should be kept once its been applied.*/ 
+    bool getKeep() const { return _keep; }
+
+    /** if this operation is a barrier then release it.*/
+    virtual void release() {}
+
+    /** Do the actual task of this operation.*/ 
+    virtual void operator () (GraphicsContext*) {}
+
+    std::string _name;
+    bool        _keep;
+};
+
 /** GraphicsThread is a helper class for running OpenGL GraphicsOperation within a single thread assigned to a specific GraphicsContext.*/
 class OSG_EXPORT GraphicsThread : public Referenced, public OpenThreads::Thread
 {
     public:
         GraphicsThread();
 
-        /** Base class for implementing graphics operations.*/
-        struct OSG_EXPORT Operation : virtual public Referenced
-        {
-            Operation(const std::string& name, bool keep):
-                _name(name),
-                _keep(keep) {}
-                
-            /** Set the human readable name of the operation.*/
-            void setName(const std::string& name) { _name = name; }
-
-            /** Get the human readable name of the operation.*/
-            const std::string& getName() const { return _name; }
-        
-            /** Set whether the operation should be kept once its been applied.*/ 
-            void setKeep(bool keep) { _keep = keep; }
-
-            /** Get whether the operation should be kept once its been applied.*/ 
-            bool getKeep() const { return _keep; }
-
-            /** if this operation is a barrier then release it.*/
-            virtual void release() {}
-
-            /** Do the actual task of this operation.*/ 
-            virtual void operator () (GraphicsContext*) {}
-            
-            std::string _name;
-            bool        _keep;
-        };
         
         /** Add operation to end of OperationQueue, this will be 
           * executed by the graphics thread once this operation gets to the head of the queue.*/
-        void add(Operation* operation, bool waitForCompletion=false);
+        void add(GraphicsOperation* operation, bool waitForCompletion=false);
         
         /** Remove operation from OperationQueue.*/
-        void remove(Operation* operation);
+        void remove(GraphicsOperation* operation);
 
         /** Remove named operation from OperationQueue.*/
         void remove(const std::string& name);
@@ -124,12 +127,13 @@ class OSG_EXPORT GraphicsThread : public Referenced, public OpenThreads::Thread
         void removeAllOperations();
         
         /** Get the operation currently being run.*/
-        osg::ref_ptr<Operation> getCurrentOperation() { return _currentOperation; }
+        osg::ref_ptr<GraphicsOperation> getCurrentOperation() { return _currentOperation; }
 
         /** Run does the graphics thread run loop.*/        
         virtual void run();
         
         void setDone(bool done);
+        
         bool getDone() const { return _done; }
 
         /** Cancel this graphics thread.*/        
@@ -142,29 +146,29 @@ class OSG_EXPORT GraphicsThread : public Referenced, public OpenThreads::Thread
         friend class GraphicsContext;
         GraphicsContext*    _graphicsContext;
 
-        typedef std::list< ref_ptr<Operation> > OperationQueue;
+        typedef std::list< ref_ptr<GraphicsOperation> > OperationQueue;
 
         bool                        _done;
 
         OpenThreads::Mutex          _operationsMutex;
         osg::ref_ptr<osg::Block>    _operationsBlock;
         OperationQueue              _operations;
-        osg::ref_ptr<Operation>     _currentOperation;
+        osg::ref_ptr<GraphicsOperation>     _currentOperation;
 
 };
 
 
 /** SwapBufferOperation calls swap buffers on the GraphicsContext.*/
-struct OSG_EXPORT SwapBuffersOperation : public GraphicsThread::Operation
+struct OSG_EXPORT SwapBuffersOperation : public GraphicsOperation
 {
     SwapBuffersOperation():
-        GraphicsThread::Operation("SwapBuffers",true) {}
+        GraphicsOperation("SwapBuffers",true) {}
 
     virtual void operator () (GraphicsContext* context);
 };
 
 /** BarrierOperation allows one to syncronize multiple GraphicsThreads with each other.*/
-struct OSG_EXPORT BarrierOperation : public GraphicsThread::Operation, public OpenThreads::Barrier
+struct OSG_EXPORT BarrierOperation : public GraphicsOperation, public OpenThreads::Barrier
 {
     enum PreBlockOp
     {
@@ -174,7 +178,7 @@ struct OSG_EXPORT BarrierOperation : public GraphicsThread::Operation, public Op
     };
 
     BarrierOperation(int numThreads, PreBlockOp op=NO_OPERATION):
-        GraphicsThread::Operation("Barrier", true),
+        GraphicsOperation("Barrier", true),
         OpenThreads::Barrier(numThreads),
         _preBlockOp(op) {}
 
@@ -187,10 +191,10 @@ struct OSG_EXPORT BarrierOperation : public GraphicsThread::Operation, public Op
 
 /** ReleaseContext_Block_MakeCurrentOperation releases the context for another thread to aquire, 
   * then blocks waiting for context to be released, once the block is release the context is re-aqquired.*/
-struct OSG_EXPORT ReleaseContext_Block_MakeCurrentOperation : public GraphicsThread::Operation, public Block
+struct OSG_EXPORT ReleaseContext_Block_MakeCurrentOperation : public GraphicsOperation, public Block
 {
     ReleaseContext_Block_MakeCurrentOperation():
-        GraphicsThread::Operation("ReleaseContext_Block_MakeCurrent", false) {}
+        GraphicsOperation("ReleaseContext_Block_MakeCurrent", false) {}
 
     virtual void release();
 
diff --git a/include/osgViewer/GraphicsWindowX11 b/include/osgViewer/GraphicsWindowX11
index d2602ef74..78fd92af9 100644
--- a/include/osgViewer/GraphicsWindowX11
+++ b/include/osgViewer/GraphicsWindowX11
@@ -34,6 +34,7 @@ class GraphicsWindowX11 : public osgViewer::GraphicsWindow
     public:
 
         GraphicsWindowX11(osg::GraphicsContext::Traits* traits):
+            _valid(false),
             _display(0),
             _parent(0),
             _window(0),
@@ -47,10 +48,17 @@ class GraphicsWindowX11 : public osgViewer::GraphicsWindow
         {
             _traits = traits;
 
-            setState( new osg::State );
-            getState()->setContextID( osg::GraphicsContext::createNewContextID() );
+            init();
+            
+            if (valid())
+            {
+                setState( new osg::State );
+                getState()->setContextID( osg::GraphicsContext::createNewContextID() );
+            }
         }
     
+        virtual bool valid() const { return _valid; }
+
         /** Realise the GraphicsContext.*/
         virtual bool realizeImplementation();
 
@@ -86,6 +94,7 @@ class GraphicsWindowX11 : public osgViewer::GraphicsWindow
         void transformMouseXY(float& x, float& y);
         void adaptKey(XKeyEvent& keyevent, int& keySymbol, unsigned int& modifierMask);
         
+        bool            _valid;
         Display*        _display;
         Window          _parent;
         Window          _window;
diff --git a/src/osg/GraphicsContext.cpp b/src/osg/GraphicsContext.cpp
index 5363be5b5..2eb3433c9 100644
--- a/src/osg/GraphicsContext.cpp
+++ b/src/osg/GraphicsContext.cpp
@@ -260,7 +260,7 @@ void GraphicsContext::setGraphicsThread(GraphicsThread* gt)
     }
 }
 
-void GraphicsContext::add(Operation* operation)
+void GraphicsContext::add(GraphicsOperation* operation)
 {
     osg::notify(osg::INFO)<<"Doing add"<<std::endl;
 
@@ -273,7 +273,7 @@ void GraphicsContext::add(Operation* operation)
     _operationsBlock->set(true);
 }
 
-void GraphicsContext::remove(Operation* operation)
+void GraphicsContext::remove(GraphicsOperation* operation)
 {
     osg::notify(osg::INFO)<<"Doing remove operation"<<std::endl;
 
diff --git a/src/osg/GraphicsThread.cpp b/src/osg/GraphicsThread.cpp
index ff0a27921..e50af3f01 100644
--- a/src/osg/GraphicsThread.cpp
+++ b/src/osg/GraphicsThread.cpp
@@ -56,10 +56,10 @@ struct ThreadExitTidyUp
     
 };
 
-struct BlockOperation : public GraphicsThread::Operation, public Block
+struct BlockOperation : public GraphicsOperation, public Block
 {
     BlockOperation():
-        GraphicsThread::Operation("Block",false)
+        GraphicsOperation("Block",false)
     {
         reset();
     }
@@ -165,7 +165,7 @@ int GraphicsThread::cancel()
     return result;
 }
 
-void GraphicsThread::add(Operation* operation, bool waitForCompletion)
+void GraphicsThread::add(GraphicsOperation* operation, bool waitForCompletion)
 {
     osg::notify(osg::INFO)<<"Doing add"<<std::endl;
 
@@ -194,7 +194,7 @@ void GraphicsThread::add(Operation* operation, bool waitForCompletion)
     }
 }
 
-void GraphicsThread::remove(Operation* operation)
+void GraphicsThread::remove(GraphicsOperation* operation)
 {
     osg::notify(osg::INFO)<<"Doing remove operation"<<std::endl;
 
diff --git a/src/osgUtil/RenderStage.cpp b/src/osgUtil/RenderStage.cpp
index 917563abd..7acaa1317 100644
--- a/src/osgUtil/RenderStage.cpp
+++ b/src/osgUtil/RenderStage.cpp
@@ -787,10 +787,10 @@ void RenderStage::drawInner(osg::RenderInfo& renderInfo,RenderLeaf*& previous, b
     }
 }
 
-struct DrawInnerOperation : public osg::GraphicsThread::Operation
+struct DrawInnerOperation : public osg::GraphicsOperation
 {
     DrawInnerOperation(RenderStage* stage, osg::RenderInfo& renderInfo) : 
-        osg::GraphicsThread::Operation("DrawInnerStage",false),
+        osg::GraphicsOperation("DrawInnerStage",false),
         _stage(stage),
         _renderInfo(renderInfo) {}
 
diff --git a/src/osgViewer/GraphicsWindowX11.cpp b/src/osgViewer/GraphicsWindowX11.cpp
index 7f322c38b..568c16dbc 100644
--- a/src/osgViewer/GraphicsWindowX11.cpp
+++ b/src/osgViewer/GraphicsWindowX11.cpp
@@ -29,11 +29,15 @@
 
 using namespace osgViewer;
 
+namespace osgViewer
+{
+
 class GraphicsContextX11 : public osg::GraphicsContext
 {
     public:
 
         GraphicsContextX11(osg::GraphicsContext::Traits* traits):
+            _valid(false),
             _display(0),
             _parent(0),
             _window(0)
@@ -41,6 +45,8 @@ class GraphicsContextX11 : public osg::GraphicsContext
             _traits = traits;
         }
     
+        virtual bool valid() const { return _valid; }
+
         /** Realise the GraphicsContext implementation, 
           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
         virtual bool realizeImplementation() { osg::notify(osg::NOTICE)<<"GraphicsWindow::realizeImplementation() not implemented."<<std::endl; return false; }
@@ -71,12 +77,14 @@ class GraphicsContextX11 : public osg::GraphicsContext
         
     protected:
         
-        Display* _display;
-        Window _parent;
-        Window _window;
+        bool        _valid;
+        Display*    _display;
+        Window      _parent;
+        Window      _window;
 
 };
 
+}
 
 bool GraphicsWindowX11::createVisualInfo()
 {
@@ -190,7 +198,13 @@ void GraphicsWindowX11::setWindowDecoration(bool flag)
 
 void GraphicsWindowX11::init()
 {
-    if (!_traits || _initialized) return;
+    if (_initialized) return;
+
+    if (!_traits)
+    {
+        _valid = false;
+        return;
+    }
 
     _display = XOpenDisplay(_traits->displayName().c_str());
     
@@ -198,7 +212,9 @@ void GraphicsWindowX11::init()
 
     if (!_display)
     {
-        osg::notify(osg::NOTICE)<<"Error: Unable to open display \"" << XDisplayName(_traits->displayName().c_str()) << "\".  Is the DISPLAY environmental variable set?"<<std::endl;
+        osg::notify(osg::NOTICE)<<"Error: Unable to open display \"" << XDisplayName(_traits->displayName().c_str()) << "\"."<<std::endl;
+        _valid = false;
+        return;
     }
 
      // Query for GLX extension
@@ -209,6 +225,7 @@ void GraphicsWindowX11::init()
 
         XCloseDisplay( _display );
         _display = 0;
+        _valid = false;
         return;
     }
     
@@ -217,6 +234,9 @@ void GraphicsWindowX11::init()
     if (!createVisualInfo())
     {
         osg::notify(osg::NOTICE)<<"Error: Not able to create requested visual." << std::endl;
+        XCloseDisplay( _display );
+        _display = 0;
+        _valid = false;
         return;
     }
     
@@ -228,6 +248,9 @@ void GraphicsWindowX11::init()
     if (!_glxContext)
     {
         osg::notify(osg::NOTICE)<<"Error: Unable to create OpenGL graphics context."<<std::endl;
+        XCloseDisplay( _display );
+        _display = 0;
+        _valid = false;
         return;
     }
     
@@ -262,6 +285,10 @@ void GraphicsWindowX11::init()
     if (!_window)
     {
         osg::notify(osg::NOTICE)<<"Error: Unable to create Window."<<std::endl;
+        XCloseDisplay( _display );
+        _display = 0;
+        _glxContext = 0;
+        _valid = false;
         return;
     }
 
@@ -323,7 +350,7 @@ void GraphicsWindowX11::init()
     
     //osg::notify(osg::NOTICE)<<"After sync apply.x = "<<watt.x<<" watt.y="<<watt.y<<" width="<<watt.width<<" height="<<watt.height<<std::endl;
 
-
+    _valid = true;
     _initialized = true;
 }
 
@@ -350,6 +377,8 @@ bool GraphicsWindowX11::realizeImplementation()
 
 void GraphicsWindowX11::makeCurrentImplementation()
 {
+    if (!_realized) return;
+
     // osg::notify(osg::NOTICE)<<"makeCurrentImplementation "<<this<<" "<<OpenThreads::Thread::CurrentThread()<<std::endl;
     // osg::notify(osg::NOTICE)<<"   glXMakeCurrent ("<<_display<<","<<_window<<","<<_glxContext<<std::endl;
 
@@ -362,15 +391,18 @@ void GraphicsWindowX11::makeCurrentImplementation()
 
 void GraphicsWindowX11::closeImplementation()
 {
-    //glXDestroyContext(_display, _glxContext );
-    XDestroyWindow(_display, _window);
+    if (_display && _window)
+    {
+        //glXDestroyContext(_display, _glxContext );
+        XDestroyWindow(_display, _window);
+
+        XFlush( _display );
+        XSync( _display,0 );
+    }
 
-    XFlush( _display );
-    XSync( _display,0 );
-    
     _window = 0;
     _parent = 0;
-    
+
     if(_visualInfo)
     {
         XFree(_visualInfo);
@@ -383,10 +415,11 @@ void GraphicsWindowX11::closeImplementation()
 
 void GraphicsWindowX11::swapBuffersImplementation()
 {
+    if (!_realized) return;
+
     // osg::notify(osg::NOTICE)<<"swapBuffersImplementation "<<this<<" "<<OpenThreads::Thread::CurrentThread()<<std::endl;
 
     // makeCurrentImplementation();
-    
 
     glXSwapBuffers(_display, _window); 
     
@@ -399,6 +432,8 @@ void GraphicsWindowX11::swapBuffersImplementation()
 
 void GraphicsWindowX11::checkEvents()
 {
+    if (!_realized) return;
+
     // osg::notify(osg::NOTICE)<<"Check events"<<std::endl;    
     while( XPending(_display) )
     {
@@ -679,15 +714,14 @@ struct X11WindowingSystemInterface : public osg::GraphicsContext::WindowingSyste
         }
         else
         {
-            osg::notify(osg::NOTICE) << "Unable to open display \"" << XDisplayName(si.displayName().c_str()) << "\".  Is the DISPLAY environmental variable set?"<<std::endl;
+            osg::notify(osg::NOTICE) << "A Unable to open display \"" << XDisplayName(si.displayName().c_str()) << "\""<<std::endl;
             return 0;
         }
     }
 
     virtual void getScreenResolution(const osg::GraphicsContext::ScreenIdentifier& si, unsigned int& width, unsigned int& height)
     {
-        const char* displayString = si.displayName().c_str();
-        Display* display = XOpenDisplay(displayString);
+        Display* display = XOpenDisplay(si.displayName().c_str());
         if(display)
         {
             width = DisplayWidth(display, si.screenNum);
@@ -696,7 +730,7 @@ struct X11WindowingSystemInterface : public osg::GraphicsContext::WindowingSyste
         }
         else
         {
-            osg::notify(osg::NOTICE) << "Unable to open display \"" << XDisplayName(displayString) << "\".  Is the DISPLAY environmental variable set?"<<std::endl;
+            osg::notify(osg::NOTICE) << "Unable to open display \"" << XDisplayName(si.displayName().c_str()) << "\"."<<std::endl;
             width = 0;
             height = 0;
         }
@@ -706,11 +740,15 @@ struct X11WindowingSystemInterface : public osg::GraphicsContext::WindowingSyste
     {
         if (traits->pbuffer)
         {
-            return new GraphicsContextX11(traits);
+            osg::ref_ptr<osgViewer::GraphicsContextX11> pbuffer = new GraphicsContextX11(traits);
+            if (pbuffer->valid()) return pbuffer.release();
+            else return 0;
         }
         else
         {
-            return new GraphicsWindowX11(traits);
+            osg::ref_ptr<osgViewer::GraphicsWindowX11> window = new GraphicsWindowX11(traits);
+            if (window->valid()) return window.release();
+            else return 0;
         }
     }
 
diff --git a/src/osgViewer/View.cpp b/src/osgViewer/View.cpp
index f82995980..19a9ee30e 100644
--- a/src/osgViewer/View.cpp
+++ b/src/osgViewer/View.cpp
@@ -168,10 +168,10 @@ void View::setUpViewAcrossAllScreens()
 }
 
 // Draw operation, that does a draw on the scene graph.
-struct RenderingOperation : public osg::GraphicsContext::Operation
+struct RenderingOperation : public osg::GraphicsOperation
 {
     RenderingOperation(osgUtil::SceneView* sceneView, osgDB::DatabasePager* databasePager):
-        osg::GraphicsContext::Operation("Render",true),
+        osg::GraphicsOperation("Render",true),
         _sceneView(sceneView),
         _databasePager(databasePager)
     {
diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp
index d65946331..ac3688dfc 100644
--- a/src/osgViewer/Viewer.cpp
+++ b/src/osgViewer/Viewer.cpp
@@ -107,10 +107,10 @@ void Viewer::getContexts(Contexts& contexts)
 OpenThreads::Mutex mutex;
 
 // Compile operation, that compile OpenGL objects.
-struct CompileOperation : public osg::GraphicsThread::Operation
+struct CompileOperation : public osg::GraphicsOperation
 {
     CompileOperation(osg::Node* scene):
-        osg::GraphicsThread::Operation("Compile",false),
+        osg::GraphicsOperation("Compile",false),
         _scene(scene)
     {
     }
@@ -136,10 +136,10 @@ struct CompileOperation : public osg::GraphicsThread::Operation
 
 
 // Draw operation, that does a draw on the scene graph.
-struct RunOperations : public osg::GraphicsThread::Operation
+struct RunOperations : public osg::GraphicsOperation
 {
     RunOperations(osg::GraphicsContext* gc):
-        osg::GraphicsThread::Operation("RunOperation",true),
+        osg::GraphicsOperation("RunOperation",true),
         _originalContext(gc)
     {
     }