diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-20 10:52:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-20 10:52:17 +1000 |
| commit | 407e8ae5b167b0193e1e5b1266a5d61ed836dfb5 (patch) | |
| tree | 2d9d05a5c3122f41a13aa8bd9ae921c1176e6b0d /src/gallium/drivers/softpipe/SConscript | |
| parent | bdaa0341caffc353fd26bbd91865c2d86eed11c1 (diff) | |
| parent | 114bb54324f22cb53bcd14607234d0acd74d37bd (diff) | |
Merge remote branch 'main/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
Diffstat (limited to 'src/gallium/drivers/softpipe/SConscript')
| -rw-r--r-- | src/gallium/drivers/softpipe/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/softpipe/SConscript b/src/gallium/drivers/softpipe/SConscript index c1f7daa8ab..f8720638a7 100644 --- a/src/gallium/drivers/softpipe/SConscript +++ b/src/gallium/drivers/softpipe/SConscript @@ -17,7 +17,7 @@ softpipe = env.ConvenienceLibrary( 'sp_setup.c', 'sp_quad_alpha_test.c', 'sp_quad_blend.c', - 'sp_quad.c', + 'sp_quad_pipe.c', 'sp_quad_colormask.c', 'sp_quad_coverage.c', 'sp_quad_depth_test.c', |