Merge remote branch 'origin/master' into lp-binning

[mesa.git] / src / gallium / drivers / llvmpipe / SConscript

diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index 6bb545a501f8f1c11c41ad057e854469f8cb3691..5af77c4a12d68c5eaaef4e8085f18bae238fad01 100644 (file)
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -36,12 +36,12 @@ llvmpipe = env.ConvenienceLibrary(
                'lp_bld_format_soa.c',
                'lp_bld_interp.c',
                'lp_bld_intr.c',
+               'lp_bld_logic.c',
                'lp_bld_misc.cpp',
         'lp_bld_pack.c',
         'lp_bld_sample.c',
                'lp_bld_sample_soa.c',
                'lp_bld_struct.c',
-               'lp_bld_logic.c',
                'lp_bld_swizzle.c',
                'lp_bld_tgsi_soa.c',            
                'lp_bld_type.c',
@@ -49,12 +49,18 @@ llvmpipe = env.ConvenienceLibrary(
                'lp_clear.c',
                'lp_context.c',
                'lp_draw_arrays.c',
+               'lp_fence.c',
                'lp_flush.c',
                'lp_jit.c',
-               'lp_prim_vbuf.c',
-               'lp_setup.c',
                'lp_query.c',
+               'lp_scene.c',
+               'lp_scene_queue.c',
                'lp_screen.c',
+               'lp_setup.c',
+               'lp_setup_line.c',
+               'lp_setup_point.c',
+               'lp_setup_tri.c',
+               'lp_setup_vbuf.c',
                'lp_state_blend.c',
                'lp_state_clip.c',
                'lp_state_derived.c',
@@ -65,10 +71,10 @@ llvmpipe = env.ConvenienceLibrary(
                'lp_state_vertex.c',
                'lp_state_vs.c',
                'lp_surface.c',
-               'lp_tex_cache.c',
+               'lp_rast.c',
+               'lp_rast_tri.c',
                'lp_tex_sample_llvm.c',
                'lp_texture.c',
-               'lp_tile_cache.c',
                'lp_tile_soa.c',
        ])