Restore GLX context after OGRE plugin loading finishes.

The probing process OGRE uses might change the current GLX context, e.g. when used with VirtualGL.

Signed-off-by: Martin Pecka <[email protected]>

ogre2/src/Ogre2RenderEngine.cc

@@ -539,8 +539,20 @@ void Ogre2RenderEngine::LoadPlugins()
       // load the plugin
       try
       {
+#if HAVE_GLX
+        // Store the current GLX context in case OGRE plugin init changes it
+        const auto context = glXGetCurrentContext();
+        const auto display = glXGetCurrentDisplay();
+        const auto drawable = glXGetCurrentDrawable();
+#endif
+
         // Load the plugin into OGRE
         this->ogreRoot->loadPlugin(filename);
+
+#if HAVE_GLX
+        // Restore GLX context
+        glXMakeCurrent(display, drawable, context);
+#endif
       }
       catch(Ogre::Exception &e)
       {