Add DataSourcePlugin::finishGL()

doc/Changelog.md

@@ -3,6 +3,9 @@ Changelog {#Changelog}
 
 # git master
 
+* [#367](https://github.com/BlueBrain/Livre/pull/367):
+  Add DataSourcePlugin::finishGL() to release OpenGL resources that are held
+  by the plugin, e.g. Cubist
 * [#363](https://github.com/BlueBrain/Livre/pull/363):
   Add detailed information on the volume URIs to help, wrap help to
   current terminal size, remove config file support

livre/core/data/DataSource.cpp

@@ -94,6 +94,11 @@ bool DataSource::initializeGL()
     return _impl->plugin->initializeGL();
 }
 
+void DataSource::finishGL()
+{
+    _impl->plugin->finishGL();
+}
+
 MemoryUnitPtr DataSource::getData( const NodeId& nodeId )
 {
     if( !nodeId.isValid( ))

livre/core/data/DataSource.h

@@ -63,6 +63,9 @@ class DataSource
     /** Initializes the GL specific functions. */
     LIVRECORE_API bool initializeGL();
 
+    /** @copydoc DataSourcePlugin::finishGL() */
+    LIVRECORE_API void finishGL();
+
     /**
      * Read the data for a given node.
      * @param nodeId NodeId to be read.

livre/core/data/DataSourcePlugin.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2016, EPFL/Blue Brain Project
+/* Copyright (c) 2011-2017, EPFL/Blue Brain Project
  *                          Ahmet Bilgili <ahmet.bilgili@epfl.ch>
  *
  * This file is part of Livre <https://github.com/BlueBrain/Livre>
@@ -73,11 +73,12 @@ class DataSourcePlugin
      */
     const VolumeInformation& getVolumeInfo() const;
 
-    /**
-     * Initializes the GL specific functions.
-     */
+    /** Initializes the GL specific functions. */
     virtual bool initializeGL() { return true; }
 
+    /** Last call with a valid and active GL context to clear GL objects. */
+    virtual void finishGL() {}
+
     /**
      * Read the data for a given node.
      * @param node LODNode to be read.

livre/eq/Window.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2016, Stefan Eilemann <eile@equalizergraphics.com>
+/* Copyright (c) 2007-2017, Stefan Eilemann <eile@equalizergraphics.com>
  *                          Maxim Makhinya  <maxmah@gmail.com>
  *                          Ahmet Bilgili   <ahmet.bilgili@epfl.ch>
  *                          Daniel Nachbaur <daniel.nachbaur@epfl.ch>
@@ -36,6 +36,7 @@
 #include <livre/lib/cache/TextureObject.h>
 
 #include <livre/core/cache/Cache.h>
+#include <livre/core/data/DataSource.h>
 #include <livre/core/render/TexturePool.h>
 
 #include <eq/gl.h>
@@ -75,6 +76,13 @@ struct Window::Impl
         _renderPipeline.reset();
         _textureCache.reset();
         _texturePool.reset();
+
+        if( _glContext.use_count() == 1 )
+        {
+            Node* node = static_cast< Node* >( _window->getNode( ));
+            node->getDataSource().finishGL();
+        }
+
         _glContext->doneCurrent();
         _glContext.reset();
         return true;