fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 17:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

scons: Always build softpipe and llvmpipe (when llvm available).

Browse source 
These are our reference software rasterizers. They can build everywhere
and are a precious debugging tool.

Making them always present immensily simplifies the scons logic.

If people want to avoid building it is still possible to pass
direcotries and target names to scons to narrow the build.
This commit is contained in:
José Fonseca 2010-04-10 03:01:30 +01:00
parent 21780adc2e
commit 47a89e9255
7 changed files with 17 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -102,11 +102,15 @@ Export([
#######################################################################
# Environment setup
# Always build trace and identity drivers
# Always build trace, identity, softpipe, and llvmpipe (where possible)
if 'trace' not in env['drivers']:
env['drivers'].append('trace')
if 'identity' not in env['drivers']:
env['drivers'].append('identity')
if 'softpipe' not in env['drivers']:
env['drivers'].append('softpipe')
if env['llvm'] and 'llvmpipe' not in env['drivers']:
env['drivers'].append('llvmpipe')
# Includes
env.Append(CPPPATH = [

8
src/gallium/drivers/sw/SConscript
View file

@ -12,17 +12,13 @@
Import('*')
if not set(('softpipe', 'llvmpipe', 'cell')).intersection(env['drivers']):
print 'warning: no supported pipe driver: skipping build of sw meta-driver'
Return()
env = env.Clone()
if 'softpipe' in env['drivers']:
if True:
env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
env.Prepend(LIBS = [softpipe])
if 'llvmpipe' in env['drivers']:
if env['llvm']:
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
env.Tool('udis86')
env.Prepend(LIBS = [llvmpipe])

4
src/gallium/state_trackers/python/SConscript
View file

@ -44,10 +44,10 @@ if 'python' in env['statetrackers']:
gallium,
])
if 'llvmpipe' in env['drivers']:
if env['llvm']:
env.Append(CPPDEFINES = ['HAVE_LLVMPIPE'])
env.Prepend(LIBS = [llvmpipe])
if 'softpipe' in env['drivers']:
if True:
env.Append(CPPDEFINES = ['HAVE_SOFTPIPE'])
env.Prepend(LIBS = [softpipe])

8
src/gallium/targets/dri-swrast/SConscript
View file

@ -1,9 +1,5 @@
Import('*')
if not set(('softpipe', 'llvmpipe')).intersection(env['drivers']):
print 'warning: no supported pipe driver: skipping build of swrastg_dri.so'
Return()
env = drienv.Clone()
env.Append(CPPPATH = [
@ -20,11 +16,11 @@ env.Prepend(LIBS = [
COMMON_DRI_SW_OBJECTS
])
if 'softpipe' in env['drivers']:
if True:
env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
env.Prepend(LIBS = [softpipe])
if 'llvmpipe' in env['drivers']:
if env['llvm']:
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
env.Tool('udis86')
env.Prepend(LIBS = [llvmpipe])

8
src/gallium/targets/graw-xlib/SConscript
View file

@ -6,10 +6,6 @@ Import('*')
if env['platform'] != 'linux':
Return()
if not set(('softpipe', 'llvmpipe', 'cell')).intersection(env['drivers']):
print 'warning: no supported pipe driver: skipping build of xlib libGL.so'
Return()
env = env.Clone()
env.Prepend(LIBS = [
@ -28,11 +24,11 @@ sources = [
'graw_xlib.c',
]
if 'softpipe' in env['drivers']:
if True:
env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
env.Prepend(LIBS = [softpipe])
if 'llvmpipe' in env['drivers']:
if env['llvm']:
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
env.Tool('udis86')
env.Prepend(LIBS = [llvmpipe])

8
src/gallium/targets/libgl-gdi/SConscript
View file

@ -22,18 +22,14 @@ if env['platform'] == 'windows':
sources = []
drivers = []
if 'softpipe' in env['drivers']:
if True:
sources = ['gdi_softpipe_winsys.c']
drivers = [softpipe]
if 'llvmpipe' in env['drivers']:
if env['llvm']:
sources = ['gdi_llvmpipe_winsys.c']
drivers = [llvmpipe]
if not sources or not drivers:
print 'warning: softpipe or llvmpipe not selected, gdi winsys disabled'
Return()
if env['gcc']:
sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def']
else:

8
src/gallium/targets/libgl-xlib/SConscript
View file

@ -14,10 +14,6 @@ if env['dri']:
print 'warning: DRI enabled: skipping build of xlib libGL.so'
Return()
if not set(('softpipe', 'llvmpipe', 'cell')).intersection(env['drivers']):
print 'warning: no supported pipe driver: skipping build of xlib libGL.so'
Return()
env = env.Clone()
env.Append(CPPPATH = [
@ -45,11 +41,11 @@ sources = [
env.Tool('x11')
if 'softpipe' in env['drivers']:
if True:
env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
env.Prepend(LIBS = [softpipe])
if 'llvmpipe' in env['drivers']:
if env['llvm']:
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
env.Tool('udis86')
env.Prepend(LIBS = [llvmpipe])