From 32a2a095f4d8e3be7fa2807cb436bd09e8eb5a75 Mon Sep 17 00:00:00 2001 From: George Sapountzis Date: Fri, 18 Apr 2008 17:34:24 +0300 Subject: glcore: build from mesa --- src/mesa/drivers/x11/glxheader.h | 1 + src/mesa/drivers/xorg/.gitignore | 3 ++ src/mesa/drivers/xorg/Makefile | 86 ++++++++++++++++++++++++++++++++++++++++ src/mesa/drivers/xorg/glcore.c | 24 +++++++++++ 4 files changed, 114 insertions(+) create mode 100644 src/mesa/drivers/xorg/.gitignore create mode 100644 src/mesa/drivers/xorg/Makefile create mode 100644 src/mesa/drivers/xorg/glcore.c (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/x11/glxheader.h b/src/mesa/drivers/x11/glxheader.h index a402191f13..15e8390583 100644 --- a/src/mesa/drivers/x11/glxheader.h +++ b/src/mesa/drivers/x11/glxheader.h @@ -34,6 +34,7 @@ #ifdef XFree86Server +# include "xorg-server.h" # include "resource.h" # include "windowstr.h" diff --git a/src/mesa/drivers/xorg/.gitignore b/src/mesa/drivers/xorg/.gitignore new file mode 100644 index 0000000000..18a777939c --- /dev/null +++ b/src/mesa/drivers/xorg/.gitignore @@ -0,0 +1,3 @@ +glxheader.h +xmesaP.h +xm_* diff --git a/src/mesa/drivers/xorg/Makefile b/src/mesa/drivers/xorg/Makefile new file mode 100644 index 0000000000..7fd7036665 --- /dev/null +++ b/src/mesa/drivers/xorg/Makefile @@ -0,0 +1,86 @@ +# src/mesa/drivers/xorg/Makefile + +TOP = ../../../.. +include $(TOP)/configs/current + +LIBNAME = libGLcore.so + +SYMLINKS = \ + glxheader.h \ + xmesaP.h \ + xm_api.c \ + xm_buffer.c \ + xm_dd.c \ + xm_image.c \ + xm_image.h \ + xm_line.c \ + xm_span.c \ + xm_tri.c + +C_SOURCES = \ + xm_api.c \ + xm_buffer.c \ + xm_dd.c \ + xm_image.c \ + xm_line.c \ + xm_span.c \ + xm_tri.c \ + glcore.c + +######################################## + +MESA_MODULES = $(TOP)/src/mesa/libmesa.a + +C_SOURCES += ../common/driverfuncs.c + +OBJECTS = $(C_SOURCES:.c=.o) + +### Include directories +INCLUDES = \ + -I. \ + -I.. \ + -I$(TOP)/include \ + -I$(TOP)/src/mesa \ + -I$(TOP)/src/mesa/main \ + -I$(TOP)/src/mesa/glapi \ + `pkg-config --cflags xorg-server` + +# undef 'USE_XSHM' to make it explicit that 'XFree86Server' takes precedence +DRIVER_DEFINES = -UUSE_XSHM -DXFree86Server + +##### RULES ##### + +.c.o: + $(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@ + + +##### TARGETS ##### + +default: depend symlinks $(LIBNAME) + + +$(LIBNAME): $(OBJECTS) $(MESA_MODULES) Makefile + $(TOP)/bin/mklib -noprefix -o $@ \ + $(OBJECTS) $(MESA_MODULES) $(GLCORE_LIB_DEPS) + + +depend: $(C_SOURCES) $(SYMLINKS) + touch depend + $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \ + > /dev/null + + +clean: + -rm -f *.o *.so $(SYMLINKS) + -rm -f depend depend.bak + +install: $(LIBNAME) + $(INSTALL) -d $(DRI_DRIVER_INSTALL_DIR) + $(INSTALL) -m 755 $(LIBNAME) $(DRI_DRIVER_INSTALL_DIR) + +$(SYMLINKS): + @[ -e $@ ] || ln -sf ../x11/$@ ./ + +symlinks: $(SYMLINKS) + +include depend diff --git a/src/mesa/drivers/xorg/glcore.c b/src/mesa/drivers/xorg/glcore.c new file mode 100644 index 0000000000..a0199117c6 --- /dev/null +++ b/src/mesa/drivers/xorg/glcore.c @@ -0,0 +1,24 @@ + +#define _NEED_GL_CORE_IF +#include +#include +#include "xmesaP.h" + +PUBLIC +__GLcoreModule GL_Core = { + XMesaCreateVisual, + XMesaDestroyVisual, + + XMesaCreateWindowBuffer, + XMesaCreatePixmapBuffer, + XMesaDestroyBuffer, + XMesaSwapBuffers, + XMesaResizeBuffers, + + XMesaCreateContext, + XMesaDestroyContext, + XMesaCopyContext, + XMesaMakeCurrent2, + XMesaForceCurrent, + XMesaLoseCurrent +}; -- cgit v1.2.3