Restore GLX context after OGRE plugin loading finishes. (#794)

The probing process OGRE uses might change the current GLX context, e.g. when used with VirtualGL. Restore GLX context after loading the OGRE plugin. It is possible the loading process changes the current GLX context. Signed-off-by: Martin Pecka <[email protected]>
gazebosim · Dec 21, 2022 · ceec441 · ceec441
1 parent 74d8c78
commit ceec441
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/ogre2/src/Ogre2RenderEngine.cc b/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)
       {