Added support for building the via unichrome dri OpenGL client driver in the

xc tree. The driver is built as via_dri.so as opposed to unichrome_dri.so when
it is built in the Mesa tree. This is because all known 2d drivers expects
this name.

2 files changed, 236 insertions, 0 deletions

diff --git a/xc/lib/GL/mesa/drivers/dri/via/Imakefile b/xc/lib/GL/mesa/drivers/dri/via/Imakefile
new file mode 100644
index 000000000..bce7140cb
--- /dev/null
+++ b/xc/lib/GL/mesa/drivers/dri/via/Imakefile
@@ -0,0 +1,77 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/via/Imakefile,v 1.22 2002/11/25 14:04:52 eich Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+XCOMM DEBUG_DEFINES = -DDEBUG_LOCKING
+XCOMM DEBUG_DEFINES = -DVIA_DEBUG
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) \
+		$(DEBUG_DEFINES)
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(VIASRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(VIAOBJS) 
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) ExpatLibrary
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(VIAOBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = via_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _via_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/xc/lib/GL/mesa/drivers/dri/via/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/via/Imakefile.inc
new file mode 100644
index 000000000..0f436df17
--- /dev/null
+++ b/xc/lib/GL/mesa/drivers/dri/via/Imakefile.inc
@@ -0,0 +1,159 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/via/Imakefile.inc,v 1.1 2001/03/23 19:18:43 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvViaBuildDir
+#define MesaDrvViaBuildDir /**/
+#endif
+MESADRVVIABUILDDIR = MesaDrvViaBuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines $(VIA_DEFINES) -DX_BYTE_ORDER=$(X_BYTE_ORDER)
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86OSSRC) \
+		-I$(DRMSRCDIR)/shared \
+		-I$(XF86DRIVERSRC)/via \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/unichrome
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+#if 0
+ DEBUG_SRC = $(MESADRVVIABUILDDIR)via_debug.c
+ DEBUG_OBJ = $(MESADRVVIABUILDDIR)via_debug.o
+ DEBUG_UOBJ = $(MESADRVVIABUILDDIR)unshared/via_debug.o
+ DEBUG_DOBJ = $(MESADRVVIABUILDDIR)debugger/via_debug.o
+ DEBUG_POBJ = $(MESADRVVIABUILDDIR)profiled/via_debug.o
+ DEBUG_DEFINES += -DVIA_DUMP
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(via_debug.c, $(MESADRVSRCDIR)/unichrome)
+#endif
+#endif
+
+      VIASRCS = $(MESADRVVIABUILDDIR)via_context.c \
+		$(MESADRVVIABUILDDIR)via_fb.c \
+		$(MESADRVVIABUILDDIR)via_ioctl.c \
+		$(MESADRVVIABUILDDIR)via_render.c \
+		$(MESADRVVIABUILDDIR)via_screen.c \
+		$(MESADRVVIABUILDDIR)via_span.c \
+		$(MESADRVVIABUILDDIR)via_state.c \
+		$(MESADRVVIABUILDDIR)via_tex.c \
+		$(MESADRVVIABUILDDIR)via_texmem.c \
+		$(MESADRVVIABUILDDIR)via_texstate.c \
+		$(MESADRVVIABUILDDIR)via_tris.c \
+		$(MESADRVVIABUILDDIR)via_vb.c \
+		$(MESADRVVIABUILDDIR)xf86drmVIA.c \
+		$(DEBUG_SRC)
+
+      VIAOBJS =$(MESADRVVIABUILDDIR)via_context.o \
+		$(MESADRVVIABUILDDIR)via_fb.o \
+		$(MESADRVVIABUILDDIR)via_ioctl.o \
+		$(MESADRVVIABUILDDIR)via_render.o \
+		$(MESADRVVIABUILDDIR)via_screen.o \
+		$(MESADRVVIABUILDDIR)via_span.o \
+		$(MESADRVVIABUILDDIR)via_state.o \
+		$(MESADRVVIABUILDDIR)via_tex.o \
+		$(MESADRVVIABUILDDIR)via_texmem.o \
+		$(MESADRVVIABUILDDIR)via_texstate.o \
+		$(MESADRVVIABUILDDIR)via_tris.o \
+		$(MESADRVVIABUILDDIR)via_vb.o \
+		$(MESADRVVIABUILDDIR)xf86drmVIA.o \
+		$(DEBUG_OBJ)
+
+
+      VIAUOBJS =$(MESADRVVIABUILDDIR)/unshared/via_context.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_fb.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_ioctl.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_render.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_screen.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_span.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_state.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_tex.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_texmem.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_texstate.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_tris.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_vb.o \
+		$(MESADRVVIABUILDDIR)/unshared/xf86drmVIA.o \
+		$(DEBUG_UOBJ)
+
+      VIADOBJS =$(MESADRVVIABUILDDIR)/debugger/via_context.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_fb.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_ioctl.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_render.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_screen.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_span.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_state.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_tex.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_texmem.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_texstate.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_tris.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_vb.o \
+		$(MESADRVVIABUILDDIR)/debugger/xf86drmVIA.o \
+		$(DEBUG_DOBJ)
+
+      VIAPOBJS =$(MESADRVVIABUILDDIR)/profiled/via_context.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_fb.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_ioctl.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_render.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_screen.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_span.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_state.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_tex.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_texmem.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_texstate.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_tris.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_vb.o \
+		$(MESADRVVIABUILDDIR)/profiled/xf86drmVIA.o \
+		$(DEBUG_POBJ)
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(via_3d_reg.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_common.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_context.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_dd_tritmp.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_dd_vbtmp.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_dmatmp.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_dri.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_fb.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_fb.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_ioctl.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_ioctl.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_render.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_screen.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_screen.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_span.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_span.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_state.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_state.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_tex.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_tex.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_texmem.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_texstate.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_tris.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_tris.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_vb.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_vb_cliptmp.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_vb.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_vb_rendertmp.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(xf86drmVIA.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(xf86drmVIA.h, $(MESADRVSRCDIR)/unichrome)
+#endif