X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2FSConscript;h=26b258b956957cac81a0f71788980928461f4850;hb=601498ae73e654c2de997ea75075613a694d604d;hp=b9e9826e2a3c27db3a47288000c8de5e42f47cb3;hpb=ff20543c815a14fddad1efaaef1610454a1924d4;p=mesa.git

diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index b9e9826e2a3..26b258b9569 100644
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -1,3 +1,6 @@
+from sys import executable as python_cmd
+import distutils.version
+
 Import('*')
 
 if not env['llvm']:
@@ -6,15 +9,13 @@ if not env['llvm']:
 
 env = env.Clone()
 
-env.Tool('udis86')
-
 env.Append(CPPPATH = ['.'])
 
 env.CodeGenerate(
 	target = 'lp_tile_soa.c',
 	script = 'lp_tile_soa.py',
 	source = ['#src/gallium/auxiliary/util/u_format.csv'],
-	command = 'python $SCRIPT $SOURCE > $TARGET'
+	command = python_cmd + ' $SCRIPT $SOURCE > $TARGET'
 )
 
 # XXX: Our dependency scanner only finds depended modules in relative dirs.
@@ -23,6 +24,10 @@ env.Depends('lp_tile_soa.c', [
     '#src/gallium/auxiliary/util/u_format_pack.py', 
 ])
 
+
+lp_tile_soa_os = env.SharedObject('lp_tile_soa.c')
+
+
 llvmpipe = env.ConvenienceLibrary(
 	target = 'llvmpipe',
 	source = [
@@ -38,9 +43,11 @@ llvmpipe = env.ConvenienceLibrary(
 		'lp_fence.c',
 		'lp_flush.c',
 		'lp_jit.c',
+		'lp_memory.c',
 		'lp_perf.c',
 		'lp_query.c',
 		'lp_rast.c',
+		'lp_rast_debug.c',
 		'lp_rast_tri.c',
 		'lp_scene.c',
 		'lp_scene_queue.c',
@@ -54,18 +61,23 @@ llvmpipe = env.ConvenienceLibrary(
 		'lp_state_clip.c',
 		'lp_state_derived.c',
 		'lp_state_fs.c',
+		'lp_state_setup.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',
+        lp_tile_soa_os,
 	])
 
+env.Alias('llvmpipe', llvmpipe)
+
 
 if env['platform'] != 'embedded':
     env = env.Clone()
@@ -76,8 +88,13 @@ if env['platform'] != 'embedded':
         'format',
         'blend',
         'conv',
+	'printf',
+	'sincos',
     ]
 
+    if not env['msvc']:
+        tests.append('round')
+
     for test in tests:
         target = env.Program(
             target = 'lp_test_' + test,
@@ -85,4 +102,4 @@ if env['platform'] != 'embedded':
         )
         env.InstallProgram(target)
 
-    Export('llvmpipe')
+Export('llvmpipe')