From bf5e573926b2b007cb238afae86207e075603f1e Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 5 Jun 2008 16:05:02 -0600 Subject: prefix some includes with mesa/ or glapi/ --- src/mesa/drivers/x11/glxapi.c | 4 ++-- src/mesa/drivers/x11/xm_api.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/mesa/drivers/x11') diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 309a0008d7..c2ccce6f52 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -34,8 +34,8 @@ #include #include #include -#include "glheader.h" -#include "glapi.h" +#include "main/glheader.h" +#include "glapi/glapi.h" #include "glxapi.h" diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index 8941817531..5bae69a472 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -65,14 +65,14 @@ #include "glxheader.h" #include "GL/xmesa.h" #include "xmesaP.h" -#include "context.h" -#include "extensions.h" -#include "framebuffer.h" -#include "glthread.h" -#include "imports.h" -#include "macros.h" -#include "renderbuffer.h" -#include "teximage.h" +#include "main/context.h" +#include "main/extensions.h" +#include "main/framebuffer.h" +#include "glapi/glthread.h" +#include "main/imports.h" +#include "main/macros.h" +#include "main/renderbuffer.h" +#include "main/teximage.h" #include "swrast/swrast.h" #include "swrast_setup/swrast_setup.h" #include "vbo/vbo.h" -- cgit v1.2.3 From ea7eb9a374bec4160b07b3c2315c00d9416daf7f Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 5 Jun 2008 16:06:17 -0600 Subject: new Makefile for building "stand-alone", Xlib-based libGL --- src/mesa/drivers/x11/Makefile | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 src/mesa/drivers/x11/Makefile (limited to 'src/mesa/drivers/x11') diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile new file mode 100644 index 0000000000..3c7219af26 --- /dev/null +++ b/src/mesa/drivers/x11/Makefile @@ -0,0 +1,59 @@ +# src/mesa/drivers/x11/Makefile for libGL.so + +# This builds "stand-alone" Mesa, a version of libGL that does not need the +# GLX extension. All rendering is converted to Xlib calls. No hardware +# acceleration. + + +TOP = ../../../.. + +include $(TOP)/configs/current + + +GL_MAJOR = 1 +GL_MINOR = 5 +GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) + + +SOURCES = \ + fakeglx.c \ + glxapi.c \ + realglx.c \ + xfonts.c \ + xm_api.c \ + xm_buffer.c \ + xm_dd.c \ + xm_glide.c \ + xm_image.c \ + xm_line.c \ + xm_span.c \ + xm_tri.c + +OBJECTS = $(SOURCES:.c=.o) + +INCLUDE_DIRS = \ + -I$(TOP)/include \ + -I$(TOP)/src/mesa \ + -I$(TOP)/src/mesa/main + +CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a + + + +.c.o: + $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ + + +default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) + + +$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA) + @ $(TOP)/bin/mklib -o $(GL_LIB) \ + -linker '$(CC)' -ldflags '$(LDFLAGS)' \ + -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ + -install $(TOP)/$(LIB_DIR) \ + $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) + + +clean: + -rm -f *.o *~ -- cgit v1.2.3 From e89e94e01a40bbaf9e77055c6cddddba0ddbc188 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 5 Jun 2008 16:26:15 -0600 Subject: added dependencies --- src/mesa/drivers/x11/Makefile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'src/mesa/drivers/x11') diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile index 3c7219af26..8ee9b61808 100644 --- a/src/mesa/drivers/x11/Makefile +++ b/src/mesa/drivers/x11/Makefile @@ -15,6 +15,15 @@ GL_MINOR = 5 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) +HEADERS = \ + glxapi.h \ + glxheader.h \ + realglx.h \ + xfonts.h \ + xmesaP.h \ + xm_glide.h \ + xm_image.h + SOURCES = \ fakeglx.c \ glxapi.c \ @@ -55,5 +64,18 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA) $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) + clean: -rm -f *.o *~ + -rm -f depend depend.bak + + + +depend: $(SOURCES) $(HEADERS) + @ echo "running $(MKDEP)" + @ touch depend + @$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(SOURCES) $(HEADERS) \ + > /dev/null 2>/dev/null + + +-include depend -- cgit v1.2.3 From f440b0ddd9690a2f8d7b7eed9b56ff77407b9114 Mon Sep 17 00:00:00 2001 From: Brian Date: Sun, 8 Jun 2008 11:25:30 -0600 Subject: remove realglx.[ch] from build --- src/mesa/drivers/x11/Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/mesa/drivers/x11') diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile index 8ee9b61808..ce5366e332 100644 --- a/src/mesa/drivers/x11/Makefile +++ b/src/mesa/drivers/x11/Makefile @@ -18,7 +18,6 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) HEADERS = \ glxapi.h \ glxheader.h \ - realglx.h \ xfonts.h \ xmesaP.h \ xm_glide.h \ @@ -27,7 +26,6 @@ HEADERS = \ SOURCES = \ fakeglx.c \ glxapi.c \ - realglx.c \ xfonts.c \ xm_api.c \ xm_buffer.c \ -- cgit v1.2.3 From 72f87b69471649ff02e80a89f902b69980f3d025 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 9 Jun 2008 16:06:44 -0600 Subject: fix Xlib libGL.so build problem. Also, build driverfuncs.c into libmesa.a since it's always needed. --- src/mesa/drivers/dri/Makefile.template | 1 - src/mesa/drivers/x11/Makefile | 2 +- src/mesa/sources | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/x11') diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index 53f9d80689..07e181e2cd 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -3,7 +3,6 @@ MESA_MODULES = $(TOP)/src/mesa/libmesa.a COMMON_SOURCES = \ - ../../common/driverfuncs.c \ ../common/utils.c \ ../common/texmem.c \ ../common/vblank.c \ diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile index ce5366e332..51226eeae1 100644 --- a/src/mesa/drivers/x11/Makefile +++ b/src/mesa/drivers/x11/Makefile @@ -59,7 +59,7 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ -install $(TOP)/$(LIB_DIR) \ - $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) + $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) $(CORE_MESA) diff --git a/src/mesa/sources b/src/mesa/sources index 122fdd1c04..2db1843239 100644 --- a/src/mesa/sources +++ b/src/mesa/sources @@ -253,6 +253,7 @@ MESA_SOURCES = \ $(SHADER_SOURCES) \ $(SWRAST_SOURCES) \ $(SWRAST_SETUP_SOURCES) \ + $(COMMON_DRIVER_SOURCES) \ $(ASM_C_SOURCES) \ $(SLANG_SOURCES) -- cgit v1.2.3 From 5b5bf2187497e8de53ca20db6c4fd4a211714b98 Mon Sep 17 00:00:00 2001 From: Wilfried Holzke Date: Tue, 17 Jun 2008 10:07:47 -0600 Subject: assorted glide driver fixes --- src/mesa/drivers/x11/xm_glide.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mesa/drivers/x11') diff --git a/src/mesa/drivers/x11/xm_glide.c b/src/mesa/drivers/x11/xm_glide.c index ae4f4282db..cbd69b011a 100644 --- a/src/mesa/drivers/x11/xm_glide.c +++ b/src/mesa/drivers/x11/xm_glide.c @@ -64,7 +64,8 @@ FXcreateContext(XMesaVisual v, XMesaWindow w, XMesaContext c, XMesaBuffer b) attribs[numAttribs++] = FXMESA_NONE; /* [dBorca] we should take an envvar for `fxMesaSelectCurrentBoard'!!! */ - hw = fxMesaSelectCurrentBoard(0); +/* hw = fxMesaSelectCurrentBoard(0); */ + hw = GR_SSTTYPE_Voodoo2; /* if these fail, there's a new bug somewhere */ ASSERT(b->mesa_buffer.Width > 0); -- cgit v1.2.3