First step of Radeon DRI unification:

- Makes all three drivers use the same screen structure and setup code, with a
  few ifdefs for the separate compilation to deal with symbols not being
  available to all drivers and the fact that we have no mechanism for dealing
  with different config options for different chip families in the same driver.
  These issues should be dealt with later.
- Introduces IS_R[123]00_CLASS(radeonScreenPtr) macro for code for taking
  different paths depending on the general class of chipset.
- Adds many new R300-class PCI IDs, though not all those listed in
  radeon_driver.c.

1 files changed, 13 insertions, 2 deletions

diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index dfeebca5a29..7d8a170a650 100644
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -14,7 +14,6 @@ endif
 DRIVER_SOURCES = r200_context.c \
 		 r200_ioctl.c \
 		 r200_lock.c \
-		 r200_screen.c \
 		 r200_state.c \
 		 r200_state_init.c \
 		 r200_cmdbuf.c \
@@ -32,12 +31,15 @@ DRIVER_SOURCES = r200_context.c \
 		 r200_vtxfmt_sse.c \
 		 r200_vtxfmt_x86.c \
 		 r200_fragshader.c \
+		 radeon_screen.c \
 		 $(EGL_SOURCES)
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
 X86_SOURCES = r200_vtxtmp_x86.S
 
+DEFINES += -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200
+
 SYMLINKS = \
 	server/radeon_egl.c  \
 	server/radeon_dri.c  \
@@ -46,6 +48,11 @@ SYMLINKS = \
 	server/radeon_macros.h \
 	server/radeon_reg.h
 
+COMMON_SYMLINKS = \
+	radeon_chipset.h \
+	radeon_screen.c \
+	radeon_screen.h
+
 ##### TARGETS #####
 
 
@@ -59,5 +66,9 @@ server:
 $(SYMLINKS): server
 	@[ -e $@ ] || ln -sf ../../radeon/$@ server/
 
-symlinks: $(SYMLINKS)
+
+$(COMMON_SYMLINKS):
+	@[ -e $@ ] || ln -sf ../radeon/$@ ./
+
+symlinks: $(SYMLINKS) $(COMMON_SYMLINKS)