I modified the internal launcher to use mesagl for the engine if
available so that saving images without screen capture works.
@@ -2805,6 +2805,12 @@ class MainLauncher(object):
# If lib/mesgl/libGL.so exists, then add lib/mesgl to LD_LIBRARY_PATH
# for gui and viewer running with a window.
#
+ # Eric Brugger, Tue Dec 11 11:52:39 PST 2018
+ # I modified Kathleen's last change so that the logic is now if
+ # lib/mesgl/libGL.so exists, then add lib/mesgl to LD_LIBRARY_PATH
+ # for the engine and the viewer running with a window. The gui doesn't
+ # use GL and saving images without screen capture now works.
+ #
############################################################################
def SetupEnvironment(self):
@@ -2901,13 +2907,14 @@ class MainLauncher(object):
SETENV("DISPLAY", self.generalArgs.viewerdisplay)
#
- # use mesagl for opengl with gui and viewer running with win?
+ # Use mesagl for opengl with the engine and with the viewer running
+ # with a window.
#
mesa_gl_dir = os.path.join(self.visitlibdir,"mesagl")
mesa_gl_lib = os.path.join(mesa_gl_dir,"libGL.so.1")
need_osmesa = 0
if ( os.path.isfile(mesa_gl_lib) and
- ( self.generalArgs.exe_name == "gui" or
+ ( self.generalArgs.exe_name.startswith("engine") or
(self.generalArgs.exe_name == "viewer" and
self.generalArgs.nowin == 0))):
SETENV("LD_LIBRARY_PATH", self.joinpaths([mesa_gl_dir, GETENV("LD_LIBRARY_PATH")]))
