X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2FSConscript;h=543d42dadd228dc8e8bbd2efdaf2549dae0c1719;hb=392a2515c0967c395be098cac6a37f325dd66b90;hp=07e6ccfce45a47724ad25ba6184abfbfc987c777;hpb=ee30e24f5f9cc2ec6c5a3edbe498e5e0334f788b;p=mesa.git

diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index 07e6ccfce45..543d42dadd2 100644
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -1,12 +1,11 @@
 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()
 
+env = env.Clone()
+
 env.Tool('udis86')
 
 env.Append(CPPPATH = ['.'])
@@ -27,13 +26,19 @@ env.Depends('lp_tile_soa.c', [
 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_fence.c',
 		'lp_flush.c',
 		'lp_jit.c',
+		'lp_memory.c',
 		'lp_perf.c',
 		'lp_query.c',
 		'lp_rast.c',
@@ -50,13 +55,15 @@ llvmpipe = env.ConvenienceLibrary(
 		'lp_state_clip.c',
 		'lp_state_derived.c',
 		'lp_state_fs.c',
+		'lp_state_gs.c',
 		'lp_state_rasterizer.c',
 		'lp_state_sampler.c',
+                'lp_state_so.c',
 		'lp_state_surface.c',
 		'lp_state_vertex.c',
 		'lp_state_vs.c',
 		'lp_surface.c',
-		'lp_tex_sample_llvm.c',
+		'lp_tex_sample.c',
 		'lp_texture.c',
 		'lp_tile_image.c',
 		'lp_tile_soa.c',
@@ -69,10 +76,16 @@ if env['platform'] != 'embedded':
     env.Prepend(LIBS = [llvmpipe] + gallium)
 
     tests = [
+        'format',
         'blend',
         'conv',
+	'printf',
+	'sincos',
     ]
 
+    if not msvc:
+        tests.append('round')
+
     for test in tests:
         target = env.Program(
             target = 'lp_test_' + test,
@@ -80,4 +93,4 @@ if env['platform'] != 'embedded':
         )
         env.InstallProgram(target)
 
-    Export('llvmpipe')
+Export('llvmpipe')