projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
gallium
/
drivers
/
llvmpipe
/
SConscript
diff --git
a/src/gallium/drivers/llvmpipe/SConscript
b/src/gallium/drivers/llvmpipe/SConscript
index a39283e5e869d1b0d4f4e46bc407e6b1f06644c7..0b827281ff9947278003d2b5473eb1a8757588d1 100644
(file)
--- a/
src/gallium/drivers/llvmpipe/SConscript
+++ b/
src/gallium/drivers/llvmpipe/SConscript
@@
-1,12
+1,11
@@
Import('*')
Import('*')
-env = env.Clone()
-
-env.Tool('llvm')
-if not env.has_key('LLVM_VERSION'):
- print 'warning: LLVM not found: not building llvmpipe'
+if not env['llvm']:
+ print 'warning: LLVM disabled: not building llvmpipe'
Return()
Return()
+env = env.Clone()
+
env.Tool('udis86')
env.Append(CPPPATH = ['.'])
env.Tool('udis86')
env.Append(CPPPATH = ['.'])
@@
-18,10
+17,21
@@
env.CodeGenerate(
command = 'python $SCRIPT $SOURCE > $TARGET'
)
command = 'python $SCRIPT $SOURCE > $TARGET'
)
+# XXX: Our dependency scanner only finds depended modules in relative dirs.
+env.Depends('lp_tile_soa.c', [
+ '#src/gallium/auxiliary/util/u_format_parse.py',
+ '#src/gallium/auxiliary/util/u_format_pack.py',
+])
+
llvmpipe = env.ConvenienceLibrary(
target = 'llvmpipe',
source = [
llvmpipe = env.ConvenienceLibrary(
target = 'llvmpipe',
source = [
- 'lp_buffer.c',
+ 'lp_bld_alpha.c',
+ 'lp_bld_blend_aos.c',
+ 'lp_bld_blend_logicop.c',
+ 'lp_bld_blend_soa.c',
+ 'lp_bld_depth.c',
+ 'lp_bld_interp.c',
'lp_clear.c',
'lp_context.c',
'lp_draw_arrays.c',
'lp_clear.c',
'lp_context.c',
'lp_draw_arrays.c',
@@
-52,6
+62,7
@@
llvmpipe = env.ConvenienceLibrary(
'lp_surface.c',
'lp_tex_sample_llvm.c',
'lp_texture.c',
'lp_surface.c',
'lp_tex_sample_llvm.c',
'lp_texture.c',
+ 'lp_tile_image.c',
'lp_tile_soa.c',
])
'lp_tile_soa.c',
])
@@
-62,7
+73,6
@@
if env['platform'] != 'embedded':
env.Prepend(LIBS = [llvmpipe] + gallium)
tests = [
env.Prepend(LIBS = [llvmpipe] + gallium)
tests = [
- 'format',
'blend',
'conv',
]
'blend',
'conv',
]