From 74d563cdfbfb07cc666d60dc909e90ddb9949cbb Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Thu, 29 Apr 2004 12:23:39 +0000 Subject: Allow *_dri.so to build in Mesa tree with the 'linux-dri' target. --- src/mesa/drivers/dri/unichrome/Makefile | 82 +--------------------------- src/mesa/drivers/dri/unichrome/via_context.c | 6 +- src/mesa/drivers/dri/unichrome/via_context.h | 4 +- src/mesa/drivers/dri/unichrome/via_dri.h | 2 +- src/mesa/drivers/dri/unichrome/via_screen.c | 2 +- src/mesa/drivers/dri/unichrome/via_screen.h | 2 +- 6 files changed, 10 insertions(+), 88 deletions(-) (limited to 'src/mesa/drivers/dri/unichrome') diff --git a/src/mesa/drivers/dri/unichrome/Makefile b/src/mesa/drivers/dri/unichrome/Makefile index 1af4f23af1..5cef902860 100644 --- a/src/mesa/drivers/dri/unichrome/Makefile +++ b/src/mesa/drivers/dri/unichrome/Makefile @@ -5,16 +5,6 @@ include $(TOP)/configs/current LIBNAME = unichrome_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 - MINIGLX_SOURCES = server/via_dri.c COMMON_SOURCES = \ @@ -42,79 +32,11 @@ DRIVER_SOURCES = \ 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$(DRM_SOURCE_PATH)\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) - - -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/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c index 80b573e0e5..9986bede6f 100644 --- a/src/mesa/drivers/dri/unichrome/via_context.c +++ b/src/mesa/drivers/dri/unichrome/via_context.c @@ -454,7 +454,7 @@ viaCreateContext(const __GLcontextModes *mesaVis, _tnl_allow_vertex_fog(ctx, GL_TRUE); #ifndef _SOLO - vmesa->display = dpy; +/* vmesa->display = dpy; */ vmesa->display = sPriv->display; #endif @@ -545,7 +545,7 @@ viaCreateContext(const __GLcontextModes *mesaVis, { GLboolean saam; int count = 0, fbSize; -#ifdef _SOLO +#ifndef USE_XINERAMA vmesa->saam = 0; #else saam = XineramaIsActive(vmesa->display); @@ -706,7 +706,7 @@ void viaXMesaWindowMoved(viaContextPtr vmesa) break; } -#ifdef _SOLO +#ifndef USE_XINERAMA vmesa->viaScreen->fbOffset = 0; vmesa->saam &= ~S1; vmesa->saam |= S0; diff --git a/src/mesa/drivers/dri/unichrome/via_context.h b/src/mesa/drivers/dri/unichrome/via_context.h index 1412360591..25d9325288 100644 --- a/src/mesa/drivers/dri/unichrome/via_context.h +++ b/src/mesa/drivers/dri/unichrome/via_context.h @@ -44,7 +44,7 @@ typedef struct via_texture_object_t *viaTextureObjectPtr; #include "via_tex.h" #include "via_common.h" #include "xf86drmVIA.h" -#ifndef _SOLO +#ifdef USE_XINERAMA #include "../../../../../include/extensions/Xinerama.h" #endif #define VIA_FALLBACK_TEXTURE 0x1 @@ -264,7 +264,7 @@ struct via_context_t { int drawW; int drawH; GLuint saam; -#ifndef _SOLO +#ifdef USE_XINERAMA XineramaScreenInfo *xsi; #endif int drawXoffSaam; diff --git a/src/mesa/drivers/dri/unichrome/via_dri.h b/src/mesa/drivers/dri/unichrome/via_dri.h index aef0ac4ba0..9c17cf6b1d 100644 --- a/src/mesa/drivers/dri/unichrome/via_dri.h +++ b/src/mesa/drivers/dri/unichrome/via_dri.h @@ -29,7 +29,7 @@ typedef struct { int priv2; int fbOffset; int fbSize; -#ifndef _SOLO +#ifdef USE_XINERAMA Bool drixinerama; #endif int backOffset; diff --git a/src/mesa/drivers/dri/unichrome/via_screen.c b/src/mesa/drivers/dri/unichrome/via_screen.c index e0f64cf94d..dd65b30f89 100644 --- a/src/mesa/drivers/dri/unichrome/via_screen.c +++ b/src/mesa/drivers/dri/unichrome/via_screen.c @@ -88,7 +88,7 @@ viaInitDriver(__DRIscreenPrivate *sPriv) viaScreen->bytesPerPixel = gDRIPriv->bytesPerPixel; viaScreen->fbOffset = 0; viaScreen->fbSize = gDRIPriv->fbSize; -#ifndef _SOLO +#ifdef USE_XINERAMA viaScreen->drixinerama = gDRIPriv->drixinerama; #endif /*=* John Sheng [2003.12.9] Tuxracer & VQ *=*/ diff --git a/src/mesa/drivers/dri/unichrome/via_screen.h b/src/mesa/drivers/dri/unichrome/via_screen.h index f8d2b9c57a..e34636df7e 100644 --- a/src/mesa/drivers/dri/unichrome/via_screen.h +++ b/src/mesa/drivers/dri/unichrome/via_screen.h @@ -43,7 +43,7 @@ typedef struct { int fbFormat; int fbOffset; int fbSize; -#ifndef _SOLO +#ifdef USE_XINERAMA Bool drixinerama; #endif -- cgit v1.2.3