From 0f135d6d35384d9270ba250637568bb62f97dea8 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 13 Sep 2007 09:30:30 +0000
Subject: [PATCH] Created two PixelBufferX11::closeImplementation() one the
 real implementation and a second non op one for GLX <1.3.

---
 src/osgViewer/PixelBufferX11.cpp | 94 ++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 42 deletions(-)

diff --git a/src/osgViewer/PixelBufferX11.cpp b/src/osgViewer/PixelBufferX11.cpp
index c743f12b5..88506ce7c 100644
--- a/src/osgViewer/PixelBufferX11.cpp
+++ b/src/osgViewer/PixelBufferX11.cpp
@@ -267,6 +267,47 @@ void PixelBufferX11::init()
     _initialized = true;
 }
 
+void PixelBufferX11::closeImplementation()
+{
+    // osg::notify(osg::NOTICE)<<"Closing PixelBufferX11"<<std::endl;
+    if (_display)
+    {
+        if (_glxContext)
+        {
+            glXDestroyContext(_display, _glxContext );
+        }
+    
+        if (_pbuffer)
+        {
+            glXDestroyPbuffer(_display, _pbuffer);
+        }
+
+        XFlush( _display );
+        XSync( _display,0 );
+
+    }
+    
+    _pbuffer = 0;
+    _parent = 0;
+    _glxContext = 0;
+
+    if (_visualInfo)
+    {
+        XFree(_visualInfo);
+        _visualInfo = 0;
+    }
+
+    if (_display)
+    {
+        XCloseDisplay( _display );
+        _display = 0;
+    }
+
+    _initialized = false;
+    _realized = false;
+    _valid = false;
+}
+
 #else
 
 // fallback for non GLX1.3 versions where pbuffers are not supported.
@@ -280,6 +321,17 @@ void PixelBufferX11::init()
 {
 }
 
+void PixelBufferX11::closeImplementation()
+{
+    // osg::notify(osg::NOTICE)<<"Closing PixelBufferX11"<<std::endl;
+    _pbuffer = 0;
+    _parent = 0;
+    _glxContext = 0;
+    _initialized = false;
+    _realized = false;
+    _valid = false;
+}
+
 #endif
 
 bool PixelBufferX11::realizeImplementation()
@@ -340,48 +392,6 @@ void PixelBufferX11::bindPBufferToTextureImplementation(GLenum buffer)
     osg::notify(osg::NOTICE)<<"PixelBufferX11::bindPBufferToTextureImplementation() not implementation yet."<<std::endl;
 }
 
-
-void PixelBufferX11::closeImplementation()
-{
-    // osg::notify(osg::NOTICE)<<"Closing PixelBufferX11"<<std::endl;
-    if (_display)
-    {
-        if (_glxContext)
-        {
-            glXDestroyContext(_display, _glxContext );
-        }
-    
-        if (_pbuffer)
-        {
-            glXDestroyPbuffer(_display, _pbuffer);
-        }
-
-        XFlush( _display );
-        XSync( _display,0 );
-
-    }
-    
-    _pbuffer = 0;
-    _parent = 0;
-    _glxContext = 0;
-
-    if (_visualInfo)
-    {
-        XFree(_visualInfo);
-        _visualInfo = 0;
-    }
-
-    if (_display)
-    {
-        XCloseDisplay( _display );
-        _display = 0;
-    }
-
-    _initialized = false;
-    _realized = false;
-    _valid = false;
-}
-
 void PixelBufferX11::swapBuffersImplementation()
 {
     if (!_realized) return;