diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-12 13:11:19 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-12 13:11:19 +1100 |
| commit | 58915980127ab4e57b6b40a8c42f44be4a12aeae (patch) | |
| tree | 176f379bb19fc8caacf96112a1ebeda8aea90a16 /src/mesa/pipe/softpipe/Makefile | |
| parent | e282d22d512d2a5871d0fabb7d855a16b4593c50 (diff) | |
| parent | b2ad30d57197c2167789e4f3f5b34af6df56dde2 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/pipe/Makefile
Diffstat (limited to 'src/mesa/pipe/softpipe/Makefile')
| -rw-r--r-- | src/mesa/pipe/softpipe/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/pipe/softpipe/Makefile b/src/mesa/pipe/softpipe/Makefile index 647cc05373..31438a882e 100644 --- a/src/mesa/pipe/softpipe/Makefile +++ b/src/mesa/pipe/softpipe/Makefile @@ -7,6 +7,7 @@ LIBNAME = softpipe DRIVER_SOURCES = \ sp_clear.c \ sp_flush.c \ + sp_query.c \ sp_context.c \ sp_draw_arrays.c \ sp_prim_setup.c \ @@ -27,7 +28,6 @@ DRIVER_SOURCES = \ sp_state_blend.c \ sp_state_clip.c \ sp_state_derived.c \ - sp_state_feedback.c \ sp_state_fs.c \ sp_state_sampler.c \ sp_state_rasterizer.c \ |