Merge remote branch 'origin/master' into pipe-video

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

diff --git a/src/gallium/drivers/softpipe/SConscript b/src/gallium/drivers/softpipe/SConscript
index 950c3d9955bff65729f4d5e98b6ca9c3e1a3e9a1..9b2abdfd7f11caa0e18fdc2b84ef12e86b49c1b3 100644 (file)
--- a/src/gallium/drivers/softpipe/SConscript
+++ b/src/gallium/drivers/softpipe/SConscript
@@ -10,6 +10,7 @@ softpipe = env.ConvenienceLibrary(
                'sp_clear.c',
                'sp_context.c',
                'sp_draw_arrays.c',
+               'sp_fence.c',
                'sp_flush.c',
                'sp_prim_vbuf.c',
                'sp_setup.c',
@@ -23,9 +24,10 @@ softpipe = env.ConvenienceLibrary(
                'sp_state_blend.c',
                'sp_state_clip.c',
                'sp_state_derived.c',
-               'sp_state_fs.c',
                'sp_state_rasterizer.c',
                'sp_state_sampler.c',
+               'sp_state_shader.c',
+               'sp_state_so.c',
                'sp_state_surface.c',
                'sp_state_vertex.c',
                'sp_surface.c',
@@ -33,6 +35,9 @@ softpipe = env.ConvenienceLibrary(
                'sp_tex_tile_cache.c',
                'sp_texture.c',
                'sp_tile_cache.c',
+               'sp_video_context.c',
        ])
 
-Export('softpipe')
\ No newline at end of file
+env.Alias('softpipe', softpipe)
+
+Export('softpipe')