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

Move LIBGL_ALWAYS_INDIRECT code to the right place

Browse Source
This commit is contained in:
Dan Winship 2009-02-24 14:59:32 -05:00
parent c67289fa2c
commit 54a9b5ae4e
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gnome-shell
View File

@ -114,6 +114,20 @@ 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")
# Set up environment
env = dict(os.environ)
env.update({'GNOME_SHELL_JS' : js_dir,
'GNOME_SHELL_DATADIR' : data_dir,
'GI_TYPELIB_PATH' : plugin_dir,
'PATH' : os.environ.get('PATH', '') + ':' + plugin_dir,
'LD_LIBRARY_PATH' : os.environ.get('LD_LIBRARY_PATH', '') + ':' + plugin_dir,
'GNOME_DISABLE_CRASH_DIALOG' : '1'})
if not options.verbose:
# Unless verbose() is specified, only let gjs show errors and
# things that are explicitly logged via log() from javascript
env['GJS_DEBUG_TOPICS'] = 'JS ERROR;JS LOG'
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
@ -135,20 +149,6 @@ def start_shell():
# need to force indirect rendering for NVIDIA. # need to force indirect rendering for NVIDIA.
env['LIBGL_ALWAYS_INDIRECT'] = '1' env['LIBGL_ALWAYS_INDIRECT'] = '1'
# Now launch metacity-clutter with our plugin
env = dict(os.environ)
env.update({'GNOME_SHELL_JS' : js_dir,
'GNOME_SHELL_DATADIR' : data_dir,
'GI_TYPELIB_PATH' : plugin_dir,
'PATH' : os.environ.get('PATH', '') + ':' + plugin_dir,
'LD_LIBRARY_PATH' : os.environ.get('LD_LIBRARY_PATH', '') + ':' + plugin_dir,
'GNOME_DISABLE_CRASH_DIALOG' : '1'})
if not options.verbose:
# Unless verbose() is specified, only let gjs show errors and
# things that are explicitly logged via log() from javascript
env['GJS_DEBUG_TOPICS'] = 'JS ERROR;JS LOG'
if options.debug: if options.debug:
debug_command = options.debug_command.split() debug_command = options.debug_command.split()
args = list(debug_command) args = list(debug_command)