isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix setting of LIBGL_ALWAYS_INDIRECT

Browse Source 
(Previous commit mistakenly only set it in verbose mode due to a cut and
paste error.)
This commit is contained in:
Dan Winship 2009-02-23 16:45:38 -05:00
parent 0763f5bc42
commit 67092f807e
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gnome-shell
View File

@ -114,7 +114,6 @@ def start_shell():
js_dir = os.path.join(top_dir, "js") js_dir = os.path.join(top_dir, "js")
data_dir = os.path.join(top_dir, "data") data_dir = os.path.join(top_dir, "data")
force_indirect = False
if use_tfp: if use_tfp:
# Decide if we need to set LIBGL_ALWAYS_INDIRECT=1 to get the # Decide if we need to set LIBGL_ALWAYS_INDIRECT=1 to get the
# texture_from_pixmap extension; we take having the extension # texture_from_pixmap extension; we take having the extension
@ -131,7 +130,10 @@ def start_shell():
(not "GLX_EXT_texture_from_pixmap" in glx_extensions)): (not "GLX_EXT_texture_from_pixmap" in glx_extensions)):
if options.verbose: if options.verbose:
print "Forcing indirect GL" print "Forcing indirect GL"
force_indirect = True # This is Mesa specific; the NVIDIA proprietary drivers
# drivers use __GL_FORCE_INDIRECT=1 instead. But we don't
# need to force indirect rendering for NVIDIA.
env['LIBGL_ALWAYS_INDIRECT'] = '1'
# Now launch metacity-clutter with our plugin # Now launch metacity-clutter with our plugin
env = dict(os.environ) env = dict(os.environ)
@ -142,13 +144,6 @@ def start_shell():
'LD_LIBRARY_PATH' : os.environ.get('LD_LIBRARY_PATH', '') + ':' + plugin_dir, 'LD_LIBRARY_PATH' : os.environ.get('LD_LIBRARY_PATH', '') + ':' + plugin_dir,
'GNOME_DISABLE_CRASH_DIALOG' : '1'}) 'GNOME_DISABLE_CRASH_DIALOG' : '1'})
if force_indirect:
if options.verbose:
# This is Mesa specific; the NVIDIA proprietary drivers
# drivers use __GL_FORCE_INDIRECT=1 instead. But we don't
# need to force indirect rendering for NVIDIA.
env['LIBGL_ALWAYS_INDIRECT'] = '1'
if not options.verbose: if not options.verbose:
# Unless verbose() is specified, only let gjs show errors and # Unless verbose() is specified, only let gjs show errors and
# things that are explicitly logged via log() from javascript # things that are explicitly logged via log() from javascript