Commit 47a89e92 authored by José Fonseca's avatar José Fonseca

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

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.
parent 21780adc
......@@ -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 = [
......
......@@ -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])
......
......@@ -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])
......
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])
......
......@@ -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])
......
......@@ -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:
......
......@@ -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])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment