Attachment 3514 Details for Bug 4713 – move glx related define's from configs/ to src/glx/x11/Makefile

[patch] move glx related define's from configs/ to src/glx/x11/Makefile

glx-defines.patch (text/plain), 7.33 KB, created by George - on 2005-10-08 06:29:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2005-10-08 06:29:22 UTC

Size: 7.33 KB

patch

obsolete

>Index: configs/freebsd-dri
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/freebsd-dri,v
>retrieving revision 1.13
>diff -u -r1.13 freebsd-dri
>--- configs/freebsd-dri	13 Sep 2005 05:19:02 -0000	1.13
>+++ configs/freebsd-dri	8 Oct 2005 12:58:00 -0000
>@@ -13,8 +13,7 @@
> 
> EXPAT_INCLUDES = -I/usr/local/include
> X11_INCLUDES = -I/usr/X11R6/include
>-DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
>-	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
>+DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
> CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef -fPIC \
> 	-ffast-math $(ASM_FLAGS) $(X11_INCLUDES)
> CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
>Index: configs/linux-dri
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/linux-dri,v
>retrieving revision 1.35
>diff -u -r1.35 linux-dri
>--- configs/linux-dri	6 Sep 2005 03:13:18 -0000	1.35
>+++ configs/linux-dri	8 Oct 2005 12:58:01 -0000
>@@ -22,8 +22,7 @@
> 
> DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
> 	-D_BSD_SOURCE -D_GNU_SOURCE \
>-	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
>-	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
>+	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
> 
> X11_INCLUDES = -I/usr/X11R6/include
> 
>Index: src/glx/x11/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/glx/x11/Makefile,v
>retrieving revision 1.21
>diff -u -r1.21 Makefile
>--- src/glx/x11/Makefile	12 Sep 2005 15:19:20 -0000	1.21
>+++ src/glx/x11/Makefile	8 Oct 2005 12:58:02 -0000
>@@ -1,7 +1,13 @@
> TOP = ../../..
> include $(TOP)/configs/current
> 
>-DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
>+DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER -DHAVE_ALIAS
>+
>+# Comment the following to build for indirect rendering only
>+DEFINES += -DGLX_DIRECT_RENDERING
>+
>+# Uncomment the following to build with XCB backend
>+# DEFINES += -DUSE_XCB
> 
> SOURCES = \
> 	  glcontextmodes.c \
>Index: src/mesa/drivers/dri/r300/r200_context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r300/r200_context.h,v
>retrieving revision 1.4
>diff -u -r1.4 r200_context.h
>--- src/mesa/drivers/dri/r300/r200_context.h	20 Jul 2005 21:35:27 -0000	1.4
>+++ src/mesa/drivers/dri/r300/r200_context.h	8 Oct 2005 12:58:30 -0000
>@@ -36,8 +36,6 @@
> #ifndef __R200_CONTEXT_H__
> #define __R200_CONTEXT_H__
> 
>-#ifdef GLX_DIRECT_RENDERING
>-
> #include "tnl/t_vertex.h"
> #include "drm.h"
> #include "radeon_drm.h"
>@@ -818,5 +816,4 @@
> 				   __DRIcontextPrivate * driContextPriv,
> 				   void *sharedContextPrivate);
> 
>-#endif
> #endif				/* __R200_CONTEXT_H__ */
>Index: src/mesa/drivers/dri/r300/r200_state.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r300/r200_state.h,v
>retrieving revision 1.4
>diff -u -r1.4 r200_state.h
>--- src/mesa/drivers/dri/r300/r200_state.h	20 Jul 2005 21:35:27 -0000	1.4
>+++ src/mesa/drivers/dri/r300/r200_state.h	8 Oct 2005 12:58:30 -0000
>@@ -35,8 +35,6 @@
> #ifndef __R200_STATE_H__
> #define __R200_STATE_H__
> 
>-#ifdef GLX_DIRECT_RENDERING
>-
> #include "r200_context.h"
> 
> extern void r200InitState(r200ContextPtr rmesa);
>@@ -55,4 +53,3 @@
> extern void r200LightingSpaceChange(GLcontext * ctx);
> 
> #endif
>-#endif
>Index: src/mesa/drivers/dri/r300/r200_tcl.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r300/r200_tcl.h,v
>retrieving revision 1.2
>diff -u -r1.2 r200_tcl.h
>--- src/mesa/drivers/dri/r300/r200_tcl.h	20 Jul 2005 21:35:27 -0000	1.2
>+++ src/mesa/drivers/dri/r300/r200_tcl.h	8 Oct 2005 12:58:30 -0000
>@@ -36,8 +36,6 @@
> #ifndef __R200_TCL_H__
> #define __R200_TCL_H__
> 
>-#ifdef GLX_DIRECT_RENDERING
>-
> #include "r200_context.h"
> 
> extern void r200TclPrimitive(GLcontext * ctx, GLenum prim, int hw_prim);
>@@ -47,4 +45,3 @@
> 			      GLuint flags);
> 
> #endif
>-#endif
>Index: src/mesa/drivers/dri/r300/r200_tex.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r300/r200_tex.h,v
>retrieving revision 1.2
>diff -u -r1.2 r200_tex.h
>--- src/mesa/drivers/dri/r300/r200_tex.h	20 Jul 2005 21:35:27 -0000	1.2
>+++ src/mesa/drivers/dri/r300/r200_tex.h	8 Oct 2005 12:58:30 -0000
>@@ -36,8 +36,6 @@
> #ifndef __R200_TEX_H__
> #define __R200_TEX_H__
> 
>-#ifdef GLX_DIRECT_RENDERING
>-
> extern void r200UpdateTextureState(GLcontext * ctx);
> 
> extern int r200UploadTexImages(r200ContextPtr rmesa, r200TexObjPtr t,
>@@ -47,5 +45,4 @@
> 
> extern void r200InitTextureFuncs(struct dd_function_table *functions);
> 
>-#endif
> #endif				/* __R200_TEX_H__ */
>Index: src/mesa/drivers/dri/r300/r300_maos.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r300/r300_maos.h,v
>retrieving revision 1.4
>diff -u -r1.4 r300_maos.h
>--- src/mesa/drivers/dri/r300/r300_maos.h	20 Jul 2005 21:35:27 -0000	1.4
>+++ src/mesa/drivers/dri/r300/r300_maos.h	8 Oct 2005 12:58:30 -0000
>@@ -36,8 +36,6 @@
> #ifndef __R300_MAOS_H__
> #define __R300_MAOS_H__
> 
>-#ifdef GLX_DIRECT_RENDERING
>-
> #include "r300_context.h"
> 
> extern void r300EmitElts(GLcontext * ctx, GLuint *elts, unsigned long n_elts);
>@@ -45,5 +43,4 @@
> extern void r300ReleaseArrays(GLcontext * ctx);
> 
> #endif
>-#endif
> 
>Index: src/mesa/drivers/dri/r300/r300_tex.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r300/r300_tex.h,v
>retrieving revision 1.4
>diff -u -r1.4 r300_tex.h
>--- src/mesa/drivers/dri/r300/r300_tex.h	20 Jul 2005 21:35:27 -0000	1.4
>+++ src/mesa/drivers/dri/r300/r300_tex.h	8 Oct 2005 12:58:30 -0000
>@@ -36,8 +36,6 @@
> #ifndef __r300_TEX_H__
> #define __r300_TEX_H__
> 
>-#ifdef GLX_DIRECT_RENDERING
>-
> extern void r300UpdateTextureState(GLcontext * ctx);
> 
> extern int r300UploadTexImages(r300ContextPtr rmesa, r300TexObjPtr t,
>@@ -47,5 +45,4 @@
> 
> extern void r300InitTextureFuncs(struct dd_function_table *functions);
> 
>-#endif
> #endif				/* __r300_TEX_H__ */
>Index: src/mesa/drivers/dri/r300/radeon_screen.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r300/radeon_screen.h,v
>retrieving revision 1.4
>diff -u -r1.4 radeon_screen.h
>--- src/mesa/drivers/dri/r300/radeon_screen.h	3 Sep 2005 16:39:57 -0000	1.4
>+++ src/mesa/drivers/dri/r300/radeon_screen.h	8 Oct 2005 12:58:30 -0000
>@@ -35,8 +35,6 @@
> #ifndef __RADEON_SCREEN_H__
> #define __RADEON_SCREEN_H__
> 
>-#ifdef GLX_DIRECT_RENDERING
>-
> #include "xf86drm.h"
> #include "drm.h"
> #include "radeon_drm.h"
>@@ -108,5 +106,4 @@
> 	driOptionCache optionCache;
> } radeonScreenRec, *radeonScreenPtr;
> 
>-#endif
> #endif				/* __RADEON_SCREEN_H__ */
>Index: src/mesa/drivers/dri/r300/radeon_span.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r300/radeon_span.h,v
>retrieving revision 1.3
>diff -u -r1.3 radeon_span.h
>--- src/mesa/drivers/dri/r300/radeon_span.h	20 Jul 2005 21:35:27 -0000	1.3
>+++ src/mesa/drivers/dri/r300/radeon_span.h	8 Oct 2005 12:58:30 -0000
>@@ -35,12 +35,9 @@
> #ifndef __RADEON_SPAN_H__
> #define __RADEON_SPAN_H__
> 
>-#ifdef GLX_DIRECT_RENDERING
>-
> #include "drirenderbuffer.h"
> 
> extern void radeonInitSpanFuncs(GLcontext * ctx);
> extern void radeonSetSpanFunctions(driRenderbuffer *rb, const GLvisual *vis);
> 
> #endif
>-#endif

Actions: View | Splinter Review

Attachments on bug 4713: 3514

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.