Allow *_dri.so to build in Mesa tree with the 'linux-dri' target.

2 files changed, 13 insertions, 94 deletions

diff --git a/src/mesa/drivers/dri/ffb/Makefile b/src/mesa/drivers/dri/ffb/Makefile
index 42ed196256d..05972ca70f6 100644
--- a/src/mesa/drivers/dri/ffb/Makefile
+++ b/src/mesa/drivers/dri/ffb/Makefile
@@ -5,16 +5,6 @@ include $(TOP)/configs/current
 
 LIBNAME = ffb_dri.so
 
-DEFINES += \
-	-D_HAVE_SWRAST=1 \
-	-D_HAVE_SWTNL=1 \
-	-D_HAVE_SANITY=1 \
-	-D_HAVE_CODEGEN=1 \
-	-D_HAVE_LIGHTING=1 \
-	-D_HAVE_TEXGEN=1 \
-	-D_HAVE_USERCLIP=1 \
-	-DGLX_DIRECT_RENDERING
-
 # not yet
 # MINIGLX_SOURCES = server/ffb_dri.c 
 
@@ -40,90 +30,15 @@ DRIVER_SOURCES = \
 	ffb_tex.c \
 	ffb_tris.c \
 	ffb_vb.c \
-	ffb_vtxfmt.c \
 	ffb_xmesa.c
 
 C_SOURCES = \
 	$(COMMON_SOURCES) \
-	$(MINIGLX_SOURCES) \
 	$(DRIVER_SOURCES)
 
-# Include directories
-INCLUDE_DIRS = \
-	-I. \
-	-I../common \
-	-Iserver \
-	-I$(TOP)/src/glx/mini \
-	-I$(TOP)/include \
-	-I$(TOP)/src/mesa/drivers/dri/drm/shared \
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/mesa/main \
-	-I$(TOP)/src/mesa/glapi \
-	-I$(TOP)/src/mesa/math \
-	-I$(TOP)/src/mesa/transform \
-	-I$(TOP)/src/mesa/shader \
-	-I$(TOP)/src/mesa/swrast \
-	-I$(TOP)/src/mesa/swrast_setup
-
-# Core Mesa objects
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-# Libraries that the driver shared lib depends on
-LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lexpat -ldl -lc
-
-
-ifeq ($(WINDOW_SYSTEM),dri)
-WINOBJ=$(MESABUILDDIR)/dri/dri.a
-WINLIB=
-else
-WINOBJ=
-WINLIB=-L$(MESA)/src/glx/mini
-endif
 
 ASM_SOURCES = 
 
-OBJECTS = $(C_SOURCES:.c=.o) \
-	  $(ASM_SOURCES:.S=.o) 
-
-
-##### RULES #####
-
-.c.o:
-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-default: depend $(LIB_DIR)/$(LIBNAME)
-
-
-$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
-	$(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \
-		$(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS)
-
-
-$(SYMLINKS):
-	mkdir -p server
-	cd server
-	rm -f $@ && ln -s ../../radeon/$@ $@
-
-
-depend: $(C_SOURCES) $(ASM_SOURCES)
-	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \
-		>& /dev/null
-
-
-# Emacs tags
-tags:
-	etags `find . -name \*.[ch]` `find ../include`
-
-
-clean:
-	-rm -f *.o server/*.o
-
+include ../Makefile.template
 
-include depend
+symlinks:
diff --git a/src/mesa/drivers/dri/ffb/ffb_xmesa.c b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
index ae31bfeb034..0fa8675e023 100644
--- a/src/mesa/drivers/dri/ffb/ffb_xmesa.c
+++ b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
@@ -56,6 +56,8 @@
 #include "ffb_vtxfmt.h"
 #include "ffb_bitmap.h"
 
+#include "drm_sarea.h"
+
 static GLboolean
 ffbInitDriver(__DRIscreenPrivate *sPriv)
 {
@@ -66,7 +68,7 @@ ffbInitDriver(__DRIscreenPrivate *sPriv)
 		return GL_FALSE;
 
 	/* Allocate the private area. */
-	ffbScreen = (ffbScreenPrivate *) Xmalloc(sizeof(ffbScreenPrivate));
+	ffbScreen = (ffbScreenPrivate *) MALLOC(sizeof(ffbScreenPrivate));
 	if (!ffbScreen)
 		return GL_FALSE;
 
@@ -75,7 +77,7 @@ ffbInitDriver(__DRIscreenPrivate *sPriv)
 		   gDRIPriv->hFbcRegs,
 		   gDRIPriv->sFbcRegs,
 		   &gDRIPriv->mFbcRegs)) {
-		Xfree(ffbScreen);
+	        FREE(ffbScreen);
 		return GL_FALSE;
 	}
 	ffbScreen->regs = (ffb_fbcPtr) gDRIPriv->mFbcRegs;
@@ -86,7 +88,7 @@ ffbInitDriver(__DRIscreenPrivate *sPriv)
 		   gDRIPriv->sDacRegs,
 		   &gDRIPriv->mDacRegs)) {
 		drmUnmap(gDRIPriv->mFbcRegs, gDRIPriv->sFbcRegs);
-		Xfree(ffbScreen);
+		FREE(ffbScreen);
 		return GL_FALSE;
 	}
 	ffbScreen->dac = (ffb_dacPtr) gDRIPriv->mDacRegs;
@@ -98,7 +100,7 @@ ffbInitDriver(__DRIscreenPrivate *sPriv)
 		   &gDRIPriv->mSfb8r)) {
 		drmUnmap(gDRIPriv->mFbcRegs, gDRIPriv->sFbcRegs);
 		drmUnmap(gDRIPriv->mDacRegs, gDRIPriv->sDacRegs);
-		Xfree(ffbScreen);
+		FREE(ffbScreen);
 		return GL_FALSE;
 	}
 	ffbScreen->sfb8r = (volatile char *) gDRIPriv->mSfb8r;
@@ -110,7 +112,7 @@ ffbInitDriver(__DRIscreenPrivate *sPriv)
 		drmUnmap(gDRIPriv->mFbcRegs, gDRIPriv->sFbcRegs);
 		drmUnmap(gDRIPriv->mDacRegs, gDRIPriv->sDacRegs);
 		drmUnmap(gDRIPriv->mSfb8r, gDRIPriv->sSfb8r);
-		Xfree(ffbScreen);
+		FREE(ffbScreen);
 		return GL_FALSE;
 	}
 	ffbScreen->sfb32 = (volatile char *) gDRIPriv->mSfb32;
@@ -123,7 +125,7 @@ ffbInitDriver(__DRIscreenPrivate *sPriv)
 		drmUnmap(gDRIPriv->mDacRegs, gDRIPriv->sDacRegs);
 		drmUnmap(gDRIPriv->mSfb8r, gDRIPriv->sSfb8r);
 		drmUnmap(gDRIPriv->mSfb32, gDRIPriv->sSfb32);
-		Xfree(ffbScreen);
+		FREE(ffbScreen);
 		return GL_FALSE;
 	}
 	ffbScreen->sfb64 = (volatile char *) gDRIPriv->mSfb64;
@@ -153,7 +155,7 @@ ffbDestroyScreen(__DRIscreenPrivate *sPriv)
 	drmUnmap(gDRIPriv->mSfb32, gDRIPriv->sSfb32);
 	drmUnmap(gDRIPriv->mSfb64, gDRIPriv->sSfb64);
 
-	Xfree(ffbScreen);
+	FREE(ffbScreen);
 }
 
 static const struct tnl_pipeline_stage *ffb_pipeline[] = {
@@ -284,7 +286,9 @@ ffbCreateContext(const __GLcontextModes *mesaVis,
 	ffbDDInitBitmapFuncs(ctx);
 	ffbInitVB(ctx);
 
+#if 0
 	ffbInitTnlModule(ctx);
+#endif
 
 	_tnl_destroy_pipeline(ctx);
 	_tnl_install_pipeline(ctx, ffb_pipeline);