summaryrefslogtreecommitdiff
path: root/src/gallium/targets
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2010-08-06 10:59:27 -0400
committerJerome Glisse <jglisse@redhat.com>2010-08-06 10:59:27 -0400
commit6e6103004c9c737297b842a4aff298da920e7c33 (patch)
tree7f7471ba377dbd6621e6eb7734292f10668b7d76 /src/gallium/targets
parentd38afcd2f286e924e0f9b7f484712ac19e3f98fc (diff)
Revert "r600g: don't use dynamic state allocation for states"
This reverts commit 9c949d4a4dd43b7889e13bdf683bcf211f049ced. Conflicts: src/gallium/drivers/r600/r600_context.h src/gallium/drivers/r600/r600_draw.c src/gallium/drivers/r600/r600_shader.c src/gallium/drivers/r600/r600_state.c
Diffstat (limited to 'src/gallium/targets')
-rw-r--r--src/gallium/targets/dri-r600/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/targets/dri-r600/Makefile b/src/gallium/targets/dri-r600/Makefile
index 9c8b4ab252..932303d194 100644
--- a/src/gallium/targets/dri-r600/Makefile
+++ b/src/gallium/targets/dri-r600/Makefile
@@ -4,12 +4,12 @@ include $(TOP)/configs/current
LIBNAME = r600_dri.so
PIPE_DRIVERS = \
- $(TOP)/src/gallium/drivers/r600/libr600.a \
$(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \
$(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
- $(TOP)/src/gallium/drivers/rbug/librbug.a
+ $(TOP)/src/gallium/drivers/rbug/librbug.a \
+ $(TOP)/src/gallium/drivers/r600/libr600.a
C_SOURCES = \
target.c \