gallivm/llvmpipe: move lp_bld_blend* files to llvmpipe/ directory

[mesa.git] / src / gallium / auxiliary / SConscript

diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index 772ab415235a1a572833e859121e81ec71005b5d..42f2cffc812fc401d4be975827d40fe5217da1ae 100644 (file)
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -23,6 +23,13 @@ env.CodeGenerate(
     command = python_cmd + ' $SCRIPT > $TARGET'
 )
 
+env.CodeGenerate(
+    target = 'util/u_format_srgb.c', 
+    script = 'util/u_format_srgb.py', 
+    source = [],
+    command = python_cmd + ' $SCRIPT > $TARGET'
+)
+
 env.CodeGenerate(
     target = 'util/u_format_table.c',
     script = 'util/u_format_table.py',
@@ -31,12 +38,17 @@ env.CodeGenerate(
 )
 
 env.CodeGenerate(
-    target = 'util/u_format_access.c',
-    script = 'util/u_format_access.py',
-    source = ['util/u_format.csv'],
-    command = 'python $SCRIPT $SOURCE > $TARGET'
+    target = 'util/u_half.c',
+    script = 'util/u_half.py',
+    source = [],
+    command = 'python $SCRIPT > $TARGET'
 )
 
+env.Depends('util/u_format_table.c', [
+    'util/u_format_parse.py', 
+    'util/u_format_pack.py', 
+])
+
 source = [
     'cso_cache/cso_context.c',
     'cso_cache/cso_cache.c',
@@ -142,10 +154,16 @@ source = [
     'util/u_dump_state.c',
     'util/u_dl.c',
     'util/u_draw_quad.c',
-    'util/u_format_access.c',
+    'util/u_format.c',
+    'util/u_format_other.c',
+    'util/u_format_s3tc.c',
+    'util/u_format_srgb.c',
     'util/u_format_table.c',
     'util/u_format_tests.c',
+    'util/u_format_yuv.c',
+    'util/u_format_zs.c',
     'util/u_gen_mipmap.c',
+    'util/u_half.c',
     'util/u_handle_table.c',
     'util/u_hash.c',
     'util/u_hash_table.c',
@@ -154,6 +172,7 @@ source = [
     'util/u_math.c',
     'util/u_mm.c',
     'util/u_rect.c',
+    'util/u_resource.c',
     'util/u_ringbuffer.c',
     'util/u_sampler.c',
     'util/u_simple_shaders.c',
@@ -161,9 +180,8 @@ source = [
     'util/u_surface.c',
     'util/u_texture.c',
     'util/u_tile.c',
-    'util/u_timed_winsys.c',
+    'util/u_transfer.c',
     'util/u_upload_mgr.c',
-    'util/u_simple_screen.c',
     # Disabling until pipe-video branch gets merged in
     #'vl/vl_bitstream_parser.c',
     #'vl/vl_mpeg12_mc_renderer.c',
@@ -173,23 +191,17 @@ source = [
     'target-helpers/wrap_screen.c',
 ]
 
-if drawllvm:
+if env['llvm']:
     source += [
-    'gallivm/lp_bld_alpha.c',
     'gallivm/lp_bld_arit.c',
-    'gallivm/lp_bld_blend_aos.c',
-    'gallivm/lp_bld_blend_logicop.c',
-    'gallivm/lp_bld_blend_soa.c',
     'gallivm/lp_bld_const.c',
     'gallivm/lp_bld_conv.c',
     'gallivm/lp_bld_debug.c',
-    'gallivm/lp_bld_depth.c',
     'gallivm/lp_bld_flow.c',
     'gallivm/lp_bld_format_soa.c',
-    'gallivm/lp_bld_interp.c',
     'gallivm/lp_bld_intr.c',
     'gallivm/lp_bld_logic.c',
-    'gallivm/lp_bld_init.cpp',
+    'gallivm/lp_bld_init.c',
     'gallivm/lp_bld_pack.c',
     'gallivm/lp_bld_printf.c',
     'gallivm/lp_bld_sample.c',
@@ -198,6 +210,9 @@ if drawllvm:
     'gallivm/lp_bld_swizzle.c',
     'gallivm/lp_bld_tgsi_soa.c',
     'gallivm/lp_bld_type.c',
+    'draw/draw_llvm.c',
+    'draw/draw_pt_fetch_shade_pipeline_llvm.c',
+    'draw/draw_llvm_translate.c'
     ]
 
 gallium = env.ConvenienceLibrary(