Merge commit 'origin/gallium-0.1' into gallium-0.1

Conflicts:

	src/gallium/drivers/softpipe/sp_quad_fs.c
	src/gallium/drivers/softpipe/sp_state.h
	src/gallium/drivers/softpipe/sp_state_fs.c

1 files changed, 0 insertions, 42 deletions

diff --git a/src/mesa/pipe/softpipe/SConscript b/src/mesa/pipe/softpipe/SConscript
deleted file mode 100644
index d581ee8d3c..0000000000
--- a/src/mesa/pipe/softpipe/SConscript
+++ /dev/null
@@ -1,42 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-softpipe = env.ConvenienceLibrary(
-	target = 'softpipe',
-	source = [
-		'sp_clear.c',
-		'sp_context.c',
-		'sp_draw_arrays.c',
-		'sp_flush.c',
-		'sp_prim_setup.c',
-		'sp_prim_vbuf.c',
-		'sp_quad_alpha_test.c',
-		'sp_quad_blend.c',
-		'sp_quad_bufloop.c',
-		'sp_quad.c',
-		'sp_quad_colormask.c',
-		'sp_quad_coverage.c',
-		'sp_quad_depth_test.c',
-		'sp_quad_earlyz.c',
-		'sp_quad_fs.c',
-		'sp_quad_occlusion.c',
-		'sp_quad_output.c',
-		'sp_quad_stencil.c',
-		'sp_quad_stipple.c',
-		'sp_query.c',
-		'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_surface.c',
-		'sp_state_vertex.c',
-		'sp_surface.c',
-		'sp_tex_sample.c',
-		'sp_texture.c',
-		'sp_tile_cache.c',
-	])
-
-Export('softpipe')
\ No newline at end of file