Attachment 1793 Details for Bug 2426 – mesa-loves-libdrm.patch

[patch] mesa-loves-libdrm.patch

mesa-loves-libdrm.patch (text/plain), 30.68 KB, created by Adam Jackson on 2005-01-30 17:42:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2005-01-30 17:42:30 UTC

Size: 30.68 KB

patch

obsolete

>? lib
>? src/glut/glx/depend
>? src/glw/depend
>? src/glx/x11/depend
>? src/glx/x11/foolog
>? src/mesa/depend
>? src/mesa/drivers/dri/i810/depend
>? src/mesa/drivers/dri/i830/depend
>? src/mesa/drivers/dri/i915/depend
>? src/mesa/drivers/dri/mach64/depend
>? src/mesa/drivers/dri/mga/depend
>? src/mesa/drivers/dri/r128/depend
>? src/mesa/drivers/dri/r200/depend
>? src/mesa/drivers/dri/r200/server
>? src/mesa/drivers/dri/radeon/depend
>? src/mesa/drivers/dri/s3v/depend
>? src/mesa/drivers/dri/s3v/s3v-header-whitespace.patch
>? src/mesa/drivers/dri/savage/depend
>? src/mesa/drivers/dri/sis/depend
>? src/mesa/drivers/dri/tdfx/depend
>? src/mesa/drivers/dri/trident/depend
>? src/mesa/drivers/dri/unichrome/depend
>? src/mesa/x86/gen_matypes
>? src/mesa/x86/matypes.h
>Index: configs/default
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/default,v
>retrieving revision 1.12
>diff -u -d -r1.12 default
>--- configs/default	8 Dec 2004 15:16:36 -0000	1.12
>+++ configs/default	31 Jan 2005 01:28:58 -0000
>@@ -10,9 +10,6 @@
> MESA_MINOR=3
> MESA_TINY=0
> 
>-# external projects
>-DRM_SOURCE_PATH=$(TOP)/../drm
>-
> # Compiler and flags
> CC = cc
> CXX = CC
>Index: configs/freebsd-dri
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/freebsd-dri,v
>retrieving revision 1.3
>diff -u -d -r1.3 freebsd-dri
>--- configs/freebsd-dri	9 Dec 2004 08:42:19 -0000	1.3
>+++ configs/freebsd-dri	31 Jan 2005 01:28:58 -0000
>@@ -19,8 +19,8 @@
> ASM_SOURCES = 
> 
> # Library/program dependencies
>-DRI_LIB_DEPS = -lm -lpthread -lexpat
>-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread
>+DRI_LIB_DEPS = -ldrm -lm -lpthread -lexpat
>+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -ldrm -lm -pthread
> 
> GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
> GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
>@@ -32,10 +32,8 @@
> PROGRAM_DIRS = 
> WINDOW_SYSTEM=dri
> 
>-DRM_SOURCE_PATH=$(TOP)/../drm
>-
> # ffb and gamma are missing because they have not been converted to use the new
> # interface.
>-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx \
>+DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon tdfx \
> 	   unichrome savage sis
> 
>Index: configs/linux-dri
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/linux-dri,v
>retrieving revision 1.20
>diff -u -d -r1.20 linux-dri
>--- configs/linux-dri	27 Dec 2004 20:38:29 -0000	1.20
>+++ configs/linux-dri	31 Jan 2005 01:28:58 -0000
>@@ -34,8 +34,8 @@
> ASM_SOURCES = 
> 
> # Library/program dependencies
>-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
>-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
>+DRI_LIB_DEPS = -ldrm -lm -lpthread -lexpat -ldl
>+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -ldrm -lm -lpthread -ldl
> 
> GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
> GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
>@@ -49,5 +49,5 @@
> 
> # ffb and gamma are missing because they have not been converted to use the new
> # interface.
>-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon s3v \
>+DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon s3v \
> 	savage sis tdfx trident unichrome
>Index: include/GL/internal/dri_interface.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/include/GL/internal/dri_interface.h,v
>retrieving revision 1.10
>diff -u -d -r1.10 dri_interface.h
>--- include/GL/internal/dri_interface.h	8 Dec 2004 12:59:15 -0000	1.10
>+++ include/GL/internal/dri_interface.h	31 Jan 2005 01:28:59 -0000
>@@ -45,8 +45,7 @@
> #endif
> 
> #include <GL/internal/glcore.h>
>-#include <xf86drm.h>
>-#include <drm.h>
>+#include <libdrm.h>
> 
> /**
>  * \name DRI interface structures
>Index: src/glx/mini/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/glx/mini/Makefile,v
>retrieving revision 1.9
>diff -u -d -r1.9 Makefile
>--- src/glx/mini/Makefile	11 Jan 2005 22:43:45 -0000	1.9
>+++ src/glx/mini/Makefile	31 Jan 2005 01:28:59 -0000
>@@ -12,9 +12,6 @@
> 	  $(TOP)/src/mesa/glapi/glapi.c \
> 	  $(TOP)/src/mesa/glapi/glthread.c \
> 	  $(TOP)/src/mesa/drivers/dri/common/glcontextmodes.c \
>-	  $(DRM_SOURCE_PATH)/libdrm/xf86drm.c \
>-	  $(DRM_SOURCE_PATH)/libdrm/xf86drmHash.c \
>-	  $(DRM_SOURCE_PATH)/libdrm/xf86drmRandom.c \
> 	  miniglx.c \
> 	  miniglx_events.c
> 
>@@ -34,9 +31,7 @@
> 	-I$(TOP)/src/mesa/transform \
> 	-I$(TOP)/src/mesa/swrast \
> 	-I$(TOP)/src/mesa/swrast_setup \
>-	-I$(TOP)/src/mesa/drivers/dri/common \
>-	-I$(DRM_SOURCE_PATH)/libdrm \
>-	-I$(DRM_SOURCE_PATH)/shared
>+	-I$(TOP)/src/mesa/drivers/dri/common
> 
> 
> ##### RULES #####
>Index: src/glx/x11/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/glx/x11/Makefile,v
>retrieving revision 1.9
>diff -u -d -r1.9 Makefile
>--- src/glx/x11/Makefile	19 Jan 2005 11:10:27 -0000	1.9
>+++ src/glx/x11/Makefile	31 Jan 2005 01:28:59 -0000
>@@ -16,10 +16,6 @@
> 	  $(TOP)/src/mesa/glapi/glapi.c \
> 	  $(TOP)/src/mesa/glapi/glthread.c \
> 	  glcontextmodes.c \
>-	  $(DRM_SOURCE_PATH)/libdrm/xf86drm.c \
>-	  $(DRM_SOURCE_PATH)/libdrm/xf86drmHash.c \
>-	  $(DRM_SOURCE_PATH)/libdrm/xf86drmRandom.c \
>-	  $(DRM_SOURCE_PATH)/libdrm/xf86drmSL.c \
> 	  clientattrib.c \
> 	  compsize.c \
> 	  dispatch.c \
>@@ -64,8 +60,6 @@
> 	-I$(TOP)/src/mesa/swrast \
> 	-I$(TOP)/src/mesa/swrast_setup \
> 	-I$(TOP)/src/mesa/drivers/dri/common \
>-	-I$(DRM_SOURCE_PATH)/libdrm \
>-	-I$(DRM_SOURCE_PATH)/shared \
> 	$(X11_INCLUDES)
> 
> 
>Index: src/glx/x11/xf86dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/glx/x11/xf86dri.h,v
>retrieving revision 1.1
>diff -u -d -r1.1 xf86dri.h
>--- src/glx/x11/xf86dri.h	25 Oct 2004 21:09:16 -0000	1.1
>+++ src/glx/x11/xf86dri.h	31 Jan 2005 01:28:59 -0000
>@@ -40,7 +40,7 @@
> #define _XF86DRI_H_
> 
> #include <X11/Xfuncproto.h>
>-#include <xf86drm.h>
>+#include <libdrm.h>
> 
> #define X_XF86DRIQueryVersion			0
> #define X_XF86DRIQueryDirectRenderingCapable	1
>Index: src/mesa/drivers/dri/Makefile.template
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/Makefile.template,v
>retrieving revision 1.18
>diff -u -d -r1.18 Makefile.template
>--- src/mesa/drivers/dri/Makefile.template	7 Jan 2005 15:24:59 -0000	1.18
>+++ src/mesa/drivers/dri/Makefile.template	31 Jan 2005 01:28:59 -0000
>@@ -4,11 +4,8 @@
> 
> 
> ifeq ($(WINDOW_SYSTEM),dri)
>-WINOBJ=../dri_client/dri.a
> WINLIB=
>-INCLUDES = $(SHARED_INCLUDES) \
>-	-I../dri_client \
>-	-I../dri_client/imports
>+INCLUDES = $(SHARED_INCLUDES)
> 
> OBJECTS = $(C_SOURCES:.c=.o) \
> 	  $(ASM_SOURCES:.S=.o) 
>@@ -18,8 +15,6 @@
> WINLIB=-L$(MESA)/src/glx/mini
> MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
> INCLUDES = $(MINIGLX_INCLUDES) \
>-	   -I$(DRM_SOURCE_PATH)/shared-core \
>-	   -I$(DRM_SOURCE_PATH)/libdrm \
> 	   $(SHARED_INCLUDES)
> 
> OBJECTS = $(C_SOURCES:.c=.o) \
>@@ -36,7 +31,6 @@
> 	-I. \
> 	-I$(TOP)/src/mesa/drivers/dri/common \
> 	-Iserver \
>-	-I$(DRM_SOURCE_PATH)/shared-core \
> 	-I$(TOP)/include \
> 	-I$(TOP)/include/GL/internal \
> 	-I$(TOP)/src/mesa \
>Index: src/mesa/drivers/dri/common/dri_util.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/common/dri_util.c,v
>retrieving revision 1.17
>diff -u -d -r1.17 dri_util.c
>--- src/mesa/drivers/dri/common/dri_util.c	12 Jan 2005 21:04:03 -0000	1.17
>+++ src/mesa/drivers/dri/common/dri_util.c	31 Jan 2005 01:28:59 -0000
>@@ -50,7 +50,6 @@
> #endif /* DRI_NEW_INTERFACE_ONLY */
> 
> #include "dri_util.h"
>-#include "drm_sarea.h"
> #include "glcontextmodes.h"
> 
> #ifndef PFNGLXGETMSCRATEOMLPROC
>Index: src/mesa/drivers/dri/common/dri_util.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/common/dri_util.h,v
>retrieving revision 1.14
>diff -u -d -r1.14 dri_util.h
>--- src/mesa/drivers/dri/common/dri_util.h	26 Jan 2005 18:02:19 -0000	1.14
>+++ src/mesa/drivers/dri/common/dri_util.h	31 Jan 2005 01:29:00 -0000
>@@ -58,8 +58,8 @@
> #else
> # include "glxclient.h"
> #endif /* DRI_NEW_INTERFACE_ONLY */
>-#include "drm.h"
>-#include "drm_sarea.h"
>+#include <drm/drm.h>
>+#include <drm/drm_sarea.h>
> #include "GL/internal/glcore.h"
> #include "GL/internal/dri_interface.h"
> 
>Index: src/mesa/drivers/dri/common/texmem.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/common/texmem.h,v
>retrieving revision 1.5
>diff -u -d -r1.5 texmem.h
>--- src/mesa/drivers/dri/common/texmem.h	19 Jun 2004 17:44:23 -0000	1.5
>+++ src/mesa/drivers/dri/common/texmem.h	31 Jan 2005 01:29:00 -0000
>@@ -41,7 +41,7 @@
> 
> #include "mtypes.h"
> #include "mm.h"
>-#include "xf86drm.h"
>+#include <libdrm.h>
> 
> struct dri_tex_heap;
> typedef struct dri_tex_heap driTexHeap;
>Index: src/mesa/drivers/dri/common/vblank.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/common/vblank.c,v
>retrieving revision 1.4
>diff -u -d -r1.4 vblank.c
>--- src/mesa/drivers/dri/common/vblank.c	4 Jul 2004 20:33:48 -0000	1.4
>+++ src/mesa/drivers/dri/common/vblank.c	31 Jan 2005 01:29:00 -0000
>@@ -28,7 +28,7 @@
> /* $XFree86:$ */
> 
> #include "glheader.h"
>-#include "xf86drm.h"
>+#include <libdrm.h>
> #include "mtypes.h"
> #include "macros.h"
> #include "dd.h"
>Index: src/mesa/drivers/dri/i810/i810context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i810/i810context.h,v
>retrieving revision 1.5
>diff -u -d -r1.5 i810context.h
>--- src/mesa/drivers/dri/i810/i810context.h	2 Jun 2004 05:07:10 -0000	1.5
>+++ src/mesa/drivers/dri/i810/i810context.h	31 Jan 2005 01:29:00 -0000
>@@ -30,7 +30,6 @@
> typedef struct i810_context_t *i810ContextPtr;
> typedef struct i810_texture_object_t *i810TextureObjectPtr;
> 
>-#include "drm.h"
> #include "mtypes.h"
> #include "mm.h"
> 
>Index: src/mesa/drivers/dri/i810/server/i810_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i810/server/i810_dri.h,v
>retrieving revision 1.5
>diff -u -d -r1.5 i810_dri.h
>--- src/mesa/drivers/dri/i810/server/i810_dri.h	2 Jun 2004 05:07:10 -0000	1.5
>+++ src/mesa/drivers/dri/i810/server/i810_dri.h	31 Jan 2005 01:29:00 -0000
>@@ -3,7 +3,7 @@
> #ifndef _I810_DRI_
> #define _I810_DRI_
> 
>-#include "xf86drm.h"
>+#include <libdrm.h>
> #include "i810_common.h"
> 
> #define I810_MAX_DRAWABLES 256
>Index: src/mesa/drivers/dri/i830/i830_context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i830/i830_context.h,v
>retrieving revision 1.8
>diff -u -d -r1.8 i830_context.h
>--- src/mesa/drivers/dri/i830/i830_context.h	2 Jun 2004 05:07:10 -0000	1.8
>+++ src/mesa/drivers/dri/i830/i830_context.h	31 Jan 2005 01:29:00 -0000
>@@ -34,9 +34,7 @@
> typedef struct i830_context_t *i830ContextPtr;
> typedef struct i830_texture_object_t *i830TextureObjectPtr;
> 
>-
> #include "mtypes.h"
>-#include "drm.h"
> #include "mm.h"
> #include "tnl/t_vertex.h"
> 
>Index: src/mesa/drivers/dri/i830/i830_ioctl.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i830/i830_ioctl.c,v
>retrieving revision 1.3
>diff -u -d -r1.3 i830_ioctl.c
>--- src/mesa/drivers/dri/i830/i830_ioctl.c	11 Mar 2004 20:35:38 -0000	1.3
>+++ src/mesa/drivers/dri/i830/i830_ioctl.c	31 Jan 2005 01:29:00 -0000
>@@ -58,8 +58,6 @@
> #include "i830_state.h"
> #include "i830_debug.h"
> 
>-#include "drm.h"
>-
> static drmBufPtr i830_get_buffer_ioctl( i830ContextPtr imesa )
> {
>    drmI830DMA dma;
>Index: src/mesa/drivers/dri/i830/server/i830_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i830/server/i830_dri.h,v
>retrieving revision 1.4
>diff -u -d -r1.4 i830_dri.h
>--- src/mesa/drivers/dri/i830/server/i830_dri.h	2 Jun 2004 05:07:10 -0000	1.4
>+++ src/mesa/drivers/dri/i830/server/i830_dri.h	31 Jan 2005 01:29:00 -0000
>@@ -3,8 +3,6 @@
> #ifndef _I830_DRI_H
> #define _I830_DRI_H
> 
>-#include "drm.h"		/* HACK!!! why doesn't xf86drm.h work??? */
>-/* #include "xf86drm.h" */
> #include "i830_common.h"
> 
> #define I830_MAX_DRAWABLES 256
>Index: src/mesa/drivers/dri/i915/intel_context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i915/intel_context.h,v
>retrieving revision 1.6
>diff -u -d -r1.6 intel_context.h
>--- src/mesa/drivers/dri/i915/intel_context.h	6 Jan 2005 14:35:44 -0000	1.6
>+++ src/mesa/drivers/dri/i915/intel_context.h	31 Jan 2005 01:29:00 -0000
>@@ -29,9 +29,7 @@
> #define INTELCONTEXT_INC
> 
> 
>-
> #include "mtypes.h"
>-#include "drm.h"
> #include "mm.h"
> #include "texmem.h"
> 
>Index: src/mesa/drivers/dri/i915/intel_ioctl.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i915/intel_ioctl.c,v
>retrieving revision 1.6
>diff -u -d -r1.6 intel_ioctl.c
>--- src/mesa/drivers/dri/i915/intel_ioctl.c	6 Jan 2005 14:35:44 -0000	1.6
>+++ src/mesa/drivers/dri/i915/intel_ioctl.c	31 Jan 2005 01:29:02 -0000
>@@ -38,7 +38,6 @@
> #include "intel_context.h"
> #include "intel_ioctl.h"
> #include "intel_batchbuffer.h"
>-#include "drm.h"
> 
> 
> 
>Index: src/mesa/drivers/dri/i915/server/i830_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i915/server/i830_dri.h,v
>retrieving revision 1.1
>diff -u -d -r1.1 i830_dri.h
>--- src/mesa/drivers/dri/i915/server/i830_dri.h	10 Jun 2004 12:48:08 -0000	1.1
>+++ src/mesa/drivers/dri/i915/server/i830_dri.h	31 Jan 2005 01:29:02 -0000
>@@ -3,7 +3,7 @@
> #ifndef _I830_DRI_H
> #define _I830_DRI_H
> 
>-#include "xf86drm.h"
>+#include <libdrm.h>
> #include "i830_common.h"
> 
> #define I830_MAX_DRAWABLES 256
>Index: src/mesa/drivers/dri/mach64/mach64_context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/mach64/mach64_context.h,v
>retrieving revision 1.11
>diff -u -d -r1.11 mach64_context.h
>--- src/mesa/drivers/dri/mach64/mach64_context.h	9 Jun 2004 05:10:29 -0000	1.11
>+++ src/mesa/drivers/dri/mach64/mach64_context.h	31 Jan 2005 01:29:02 -0000
>@@ -35,8 +35,7 @@
> #ifdef GLX_DIRECT_RENDERING
> 
> #include "dri_util.h"
>-#include "drm.h"
>-#include "mach64_drm.h"
>+#include <drm/mach64_drm.h>
> 
> #include "mtypes.h"
> 
>Index: src/mesa/drivers/dri/mach64/server/mach64_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/mach64/server/mach64_dri.h,v
>retrieving revision 1.3
>diff -u -d -r1.3 mach64_dri.h
>--- src/mesa/drivers/dri/mach64/server/mach64_dri.h	2 Jun 2004 05:07:10 -0000	1.3
>+++ src/mesa/drivers/dri/mach64/server/mach64_dri.h	31 Jan 2005 01:29:02 -0000
>@@ -31,7 +31,7 @@
> #ifndef __MACH64_DRI_H__
> #define __MACH64_DRI_H__ 1
> 
>-#include "xf86drm.h"
>+#include <libdrm.h>
> 
> typedef struct {
>    drm_handle_t fbHandle;
>Index: src/mesa/drivers/dri/mga/mga_xmesa.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/mga/mga_xmesa.c,v
>retrieving revision 1.36
>diff -u -d -r1.36 mga_xmesa.c
>--- src/mesa/drivers/dri/mga/mga_xmesa.c	16 Dec 2004 00:23:47 -0000	1.36
>+++ src/mesa/drivers/dri/mga/mga_xmesa.c	31 Jan 2005 01:29:02 -0000
>@@ -27,8 +27,6 @@
>  */
> 
> #include <stdlib.h>
>-#include "drm.h"
>-#include "mga_drm.h"
> #include "mga_xmesa.h"
> #include "context.h"
> #include "matrix.h"
>Index: src/mesa/drivers/dri/mga/mga_xmesa.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/mga/mga_xmesa.h,v
>retrieving revision 1.8
>diff -u -d -r1.8 mga_xmesa.h
>--- src/mesa/drivers/dri/mga/mga_xmesa.h	14 Dec 2004 09:11:53 -0000	1.8
>+++ src/mesa/drivers/dri/mga/mga_xmesa.h	31 Jan 2005 01:29:02 -0000
>@@ -33,7 +33,7 @@
> 
> #include <sys/time.h>
> #include "dri_util.h"
>-#include "mga_drm.h"
>+#include <drm/mga_drm.h>
> #include "mtypes.h"
> #include "mgaregs.h"
> #include "xmlconfig.h"
>Index: src/mesa/drivers/dri/mga/mgacontext.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/mga/mgacontext.h,v
>retrieving revision 1.12
>diff -u -d -r1.12 mgacontext.h
>--- src/mesa/drivers/dri/mga/mgacontext.h	2 Jun 2004 05:07:11 -0000	1.12
>+++ src/mesa/drivers/dri/mga/mgacontext.h	31 Jan 2005 01:29:02 -0000
>@@ -29,11 +29,10 @@
> #ifndef MGALIB_INC
> #define MGALIB_INC
> 
>-#include "drm.h"
>-#include "mga_drm.h"
>+#include <libdrm.h>
>+#include <drm/mga_drm.h>
> #include "dri_util.h"
> #include "mtypes.h"
>-#include "xf86drm.h"
> #include "mm.h"
> #include "colormac.h"
> #include "texmem.h"
>Index: src/mesa/drivers/dri/mga/mgaioctl.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/mga/mgaioctl.c,v
>retrieving revision 1.11
>diff -u -d -r1.11 mgaioctl.c
>--- src/mesa/drivers/dri/mga/mgaioctl.c	12 Mar 2004 20:03:54 -0000	1.11
>+++ src/mesa/drivers/dri/mga/mgaioctl.c	31 Jan 2005 01:29:02 -0000
>@@ -34,8 +34,6 @@
> #include "swrast/swrast.h"
> 
> #include "mm.h"
>-#include "drm.h"
>-#include "mga_drm.h"
> #include "mgacontext.h"
> #include "mgadd.h"
> #include "mgastate.h"
>@@ -43,6 +41,7 @@
> #include "mgavb.h"
> #include "mgaioctl.h"
> #include "mgatris.h"
>+#include <drm/mga_drm.h>
> 
> #include "vblank.h"
> 
>Index: src/mesa/drivers/dri/mga/server/mga_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/mga/server/mga_dri.h,v
>retrieving revision 1.3
>diff -u -d -r1.3 mga_dri.h
>--- src/mesa/drivers/dri/mga/server/mga_dri.h	12 Mar 2004 05:22:15 -0000	1.3
>+++ src/mesa/drivers/dri/mga/server/mga_dri.h	31 Jan 2005 01:29:02 -0000
>@@ -31,9 +31,8 @@
> #ifndef __MGA_DRI_H__
> #define __MGA_DRI_H__
> 
>-#include "xf86drm.h"
>-#include "drm.h"
>-#include "mga_drm.h"
>+#include <libdrm.h>
>+#include <drm/mga_drm.h>
> 
> #define MGA_DEFAULT_AGP_SIZE     64
> #define MGA_DEFAULT_AGP_MODE     4
>Index: src/mesa/drivers/dri/r128/r128_context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r128/r128_context.h,v
>retrieving revision 1.12
>diff -u -d -r1.12 r128_context.h
>--- src/mesa/drivers/dri/r128/r128_context.h	14 Dec 2004 09:11:53 -0000	1.12
>+++ src/mesa/drivers/dri/r128/r128_context.h	31 Jan 2005 01:29:02 -0000
>@@ -39,8 +39,7 @@
> #ifdef GLX_DIRECT_RENDERING
> 
> #include "dri_util.h"
>-#include "drm.h"
>-#include "r128_drm.h"
>+#include <drm/r128_drm.h>
> 
> #include "mtypes.h"
> #include "tnl/t_vertex.h"
>Index: src/mesa/drivers/dri/r128/server/r128_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r128/server/r128_dri.h,v
>retrieving revision 1.4
>diff -u -d -r1.4 r128_dri.h
>--- src/mesa/drivers/dri/r128/server/r128_dri.h	2 Jun 2004 22:45:00 -0000	1.4
>+++ src/mesa/drivers/dri/r128/server/r128_dri.h	31 Jan 2005 01:29:02 -0000
>@@ -39,8 +39,7 @@
> #ifndef _R128_DRI_
> #define _R128_DRI_
> 
>-#include "xf86drm.h"
>-#include "drm.h"
>+#include <libdrm.h>
> 
> /* DRI Driver defaults */
> #define R128_DEFAULT_CCE_PIO_MODE R128_PM4_64PIO_64VCBM_64INDBM
>Index: src/mesa/drivers/dri/r200/r200_context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r200/r200_context.h,v
>retrieving revision 1.25
>diff -u -d -r1.25 r200_context.h
>--- src/mesa/drivers/dri/r200/r200_context.h	8 Dec 2004 17:32:46 -0000	1.25
>+++ src/mesa/drivers/dri/r200/r200_context.h	31 Jan 2005 01:29:02 -0000
>@@ -39,9 +39,8 @@
> #ifdef GLX_DIRECT_RENDERING
> 
> #include "tnl/t_vertex.h"
>-#include "drm.h"
>-#include "radeon_drm.h"
> #include "dri_util.h"
>+#include <drm/radeon_drm.h>
> #include "texmem.h"
> 
> #include "macros.h"
>Index: src/mesa/drivers/dri/r200/r200_ioctl.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r200/r200_ioctl.h,v
>retrieving revision 1.12
>diff -u -d -r1.12 r200_ioctl.h
>--- src/mesa/drivers/dri/r200/r200_ioctl.h	30 Sep 2004 00:08:05 -0000	1.12
>+++ src/mesa/drivers/dri/r200/r200_ioctl.h	31 Jan 2005 01:29:02 -0000
>@@ -42,9 +42,8 @@
> #include "radeon_dri.h"
> #include "r200_lock.h"
> 
>-#include "xf86drm.h"
>-#include "drm.h"
>-#include "radeon_drm.h"
>+#include <libdrm.h>
>+#include <drm/radeon_drm.h>
> 
> extern void r200EmitState( r200ContextPtr rmesa );
> extern void r200EmitVertexAOS( r200ContextPtr rmesa,
>Index: src/mesa/drivers/dri/r200/r200_screen.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r200/r200_screen.h,v
>retrieving revision 1.11
>diff -u -d -r1.11 r200_screen.h
>--- src/mesa/drivers/dri/r200/r200_screen.h	26 Jan 2005 18:05:03 -0000	1.11
>+++ src/mesa/drivers/dri/r200/r200_screen.h	31 Jan 2005 01:29:02 -0000
>@@ -38,9 +38,8 @@
> 
> #ifdef GLX_DIRECT_RENDERING
> 
>-#include "xf86drm.h"
>-#include "drm.h"
>-#include "radeon_drm.h"
>+#include <libdrm.h>
>+#include <drm/radeon_drm.h>
> #include "dri_util.h"
> #include "xmlconfig.h"
> 
>Index: src/mesa/drivers/dri/radeon/radeon_context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/radeon/radeon_context.h,v
>retrieving revision 1.19
>diff -u -d -r1.19 radeon_context.h
>--- src/mesa/drivers/dri/radeon/radeon_context.h	23 Jan 2005 06:27:08 -0000	1.19
>+++ src/mesa/drivers/dri/radeon/radeon_context.h	31 Jan 2005 01:29:02 -0000
>@@ -41,8 +41,7 @@
> #ifdef GLX_DIRECT_RENDERING
> 
> #include "dri_util.h"
>-#include "drm.h"
>-#include "radeon_drm.h"
>+#include <drm/radeon_drm.h>
> #include "texmem.h"
> 
> #include "macros.h"
>Index: src/mesa/drivers/dri/radeon/radeon_screen.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/radeon/radeon_screen.h,v
>retrieving revision 1.12
>diff -u -d -r1.12 radeon_screen.h
>--- src/mesa/drivers/dri/radeon/radeon_screen.h	26 Jan 2005 18:05:03 -0000	1.12
>+++ src/mesa/drivers/dri/radeon/radeon_screen.h	31 Jan 2005 01:29:02 -0000
>@@ -46,7 +46,7 @@
> /* #include "dri_util.h" */
> #include "radeon_dri.h"
> #include "radeon_reg.h"
>-#include "drm_sarea.h"
>+#include <drm/drm_sarea.h>
> #include "xmlconfig.h"
> 
> 
>Index: src/mesa/drivers/dri/radeon/server/radeon_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/radeon/server/radeon_dri.h,v
>retrieving revision 1.6
>diff -u -d -r1.6 radeon_dri.h
>--- src/mesa/drivers/dri/radeon/server/radeon_dri.h	2 Jun 2004 05:07:11 -0000	1.6
>+++ src/mesa/drivers/dri/radeon/server/radeon_dri.h	31 Jan 2005 01:29:02 -0000
>@@ -39,9 +39,8 @@
> #ifndef _RADEON_DRI_
> #define _RADEON_DRI_
> 
>-#include "xf86drm.h"
>-#include "drm.h"
>-#include "radeon_drm.h"
>+#include <libdrm.h>
>+#include <drm/radeon_drm.h>
> 
> /* DRI Driver defaults */
> #define RADEON_DEFAULT_CP_PIO_MODE    RADEON_CSQ_PRIPIO_INDPIO
>Index: src/mesa/drivers/dri/s3v/s3v_context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/s3v/s3v_context.h,v
>retrieving revision 1.2
>diff -u -d -r1.2 s3v_context.h
>--- src/mesa/drivers/dri/s3v/s3v_context.h	27 Dec 2004 20:31:56 -0000	1.2
>+++ src/mesa/drivers/dri/s3v/s3v_context.h	31 Jan 2005 01:29:03 -0000
>@@ -14,7 +14,6 @@
> #include "colormac.h"
> #include "macros.h"
> #include "mtypes.h"
>-#include "drm.h"
> #include "mm.h"
> 
> /* Flags for context */
>Index: src/mesa/drivers/dri/savage/savagecontext.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/savage/savagecontext.h,v
>retrieving revision 1.19
>diff -u -d -r1.19 savagecontext.h
>--- src/mesa/drivers/dri/savage/savagecontext.h	29 Jan 2005 23:26:24 -0000	1.19
>+++ src/mesa/drivers/dri/savage/savagecontext.h	31 Jan 2005 01:29:03 -0000
>@@ -34,9 +34,8 @@
> #include <X11/Xlibint.h>
> #include "dri_util.h"
> #include "mtypes.h"
>-#include "xf86drm.h"
>-#include "drm.h"
>-#include "savage_drm.h"
>+#include <libdrm.h>
>+#include <drm/savage_drm.h>
> #include "savage_init.h"
> #include "savage_3d_reg.h"
> #include "mm.h"
>Index: src/mesa/drivers/dri/savage/savageioctl.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/savage/savageioctl.c,v
>retrieving revision 1.16
>diff -u -d -r1.16 savageioctl.c
>--- src/mesa/drivers/dri/savage/savageioctl.c	21 Jan 2005 01:39:09 -0000	1.16
>+++ src/mesa/drivers/dri/savage/savageioctl.c	31 Jan 2005 01:29:03 -0000
>@@ -40,7 +40,6 @@
> #include "savagestate.h"
> #include "savagespan.h"
> 
>-#include "drm.h"
> #include <sys/ioctl.h>
> #include <sys/timeb.h>
> 
>Index: src/mesa/drivers/dri/savage/server/savage_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/savage/server/savage_dri.h,v
>retrieving revision 1.2
>diff -u -d -r1.2 savage_dri.h
>--- src/mesa/drivers/dri/savage/server/savage_dri.h	1 Jan 2005 20:40:14 -0000	1.2
>+++ src/mesa/drivers/dri/savage/server/savage_dri.h	31 Jan 2005 01:29:03 -0000
>@@ -26,8 +26,7 @@
> #ifndef __SAVAGE_DRI_H__
> #define __SAVAGE_DRI_H__
> 
>-#include "xf86drm.h"
>-#include "drm.h"
>+#include <libdrm.h>
> 
> /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up
>  * to 32 clients. */
>Index: src/mesa/drivers/dri/sis/sis_context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/sis/sis_context.h,v
>retrieving revision 1.11
>diff -u -d -r1.11 sis_context.h
>--- src/mesa/drivers/dri/sis/sis_context.h	10 Jun 2004 09:13:31 -0000	1.11
>+++ src/mesa/drivers/dri/sis/sis_context.h	31 Jan 2005 01:29:04 -0000
>@@ -37,8 +37,6 @@
> 
> #include "context.h"
> #include "dri_util.h"
>-#include "drm.h"
>-#include "drm_sarea.h"
> #include "xmlconfig.h"
> #include "tnl/t_vertex.h"
> 
>Index: src/mesa/drivers/dri/sis/server/sis_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/sis/server/sis_dri.h,v
>retrieving revision 1.3
>diff -u -d -r1.3 sis_dri.h
>--- src/mesa/drivers/dri/sis/server/sis_dri.h	2 Jun 2004 22:45:01 -0000	1.3
>+++ src/mesa/drivers/dri/sis/server/sis_dri.h	31 Jan 2005 01:29:04 -0000
>@@ -5,8 +5,7 @@
> #ifndef _SIS_DRI_
> #define _SIS_DRI_
> 
>-#include "xf86drm.h"
>-#include "drm.h"
>+#include <libdrm.h>
> 
> #define SIS_MAX_DRAWABLES 256
> #define SISIOMAPSIZE (64*1024)
>Index: src/mesa/drivers/dri/tdfx/tdfx_context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/tdfx/tdfx_context.h,v
>retrieving revision 1.6
>diff -u -d -r1.6 tdfx_context.h
>--- src/mesa/drivers/dri/tdfx/tdfx_context.h	19 Jul 2004 08:06:00 -0000	1.6
>+++ src/mesa/drivers/dri/tdfx/tdfx_context.h	31 Jan 2005 01:29:04 -0000
>@@ -53,8 +53,6 @@
> #include <signal.h>
> #endif
> 
>-#include "drm.h"
>-#include "drm_sarea.h"
> #include "tdfx_glide.h"
> 
> #include "clip.h"
>Index: src/mesa/drivers/dri/tdfx/server/tdfx_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/tdfx/server/tdfx_dri.h,v
>retrieving revision 1.3
>diff -u -d -r1.3 tdfx_dri.h
>--- src/mesa/drivers/dri/tdfx/server/tdfx_dri.h	2 Jun 2004 22:45:01 -0000	1.3
>+++ src/mesa/drivers/dri/tdfx/server/tdfx_dri.h	31 Jan 2005 01:29:04 -0000
>@@ -3,8 +3,7 @@
> #ifndef _TDFX_DRI_
> #define _TDFX_DRI_
> 
>-#include "xf86drm.h"
>-#include "drm.h"
>+#include <libdrm.h>
> 
> typedef struct {
>   drm_handle_t regs;
>Index: src/mesa/drivers/dri/trident/trident_context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/trident/trident_context.h,v
>retrieving revision 1.2
>diff -u -d -r1.2 trident_context.h
>--- src/mesa/drivers/dri/trident/trident_context.h	24 Dec 2004 03:04:14 -0000	1.2
>+++ src/mesa/drivers/dri/trident/trident_context.h	31 Jan 2005 01:29:04 -0000
>@@ -30,7 +30,6 @@
> #include "dri_util.h"
> #include "macros.h"
> #include "mtypes.h"
>-#include "drm.h"
> #include "mm.h"
> 
> #define SUBPIXEL_X (0.0F)
>Index: src/mesa/drivers/dri/trident/trident_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/trident/trident_dri.h,v
>retrieving revision 1.1
>diff -u -d -r1.1 trident_dri.h
>--- src/mesa/drivers/dri/trident/trident_dri.h	24 Dec 2004 03:04:14 -0000	1.1
>+++ src/mesa/drivers/dri/trident/trident_dri.h	31 Jan 2005 01:29:04 -0000
>@@ -1,7 +1,7 @@
> #ifndef _TRIDENT_DRI_
> #define _TRIDENT_DRI_
> 
>-#include "xf86drm.h"
>+#include <libdrm.h>
> 
> typedef struct {
>   drm_handle_t regs;
>Index: src/mesa/drivers/dri/unichrome/via_context.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/unichrome/via_context.h,v
>retrieving revision 1.30
>diff -u -d -r1.30 via_context.h
>--- src/mesa/drivers/dri/unichrome/via_context.h	19 Jan 2005 12:09:33 -0000	1.30
>+++ src/mesa/drivers/dri/unichrome/via_context.h	31 Jan 2005 01:29:04 -0000
>@@ -33,7 +33,6 @@
> #include "dri_util.h"
> 
> #include "mtypes.h"
>-#include "drm.h"
> #include "mm.h"
> #include "tnl/t_vertex.h"
> 
>Index: src/mesa/drivers/dri/unichrome/via_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/unichrome/via_dri.h,v
>retrieving revision 1.6
>diff -u -d -r1.6 via_dri.h
>--- src/mesa/drivers/dri/unichrome/via_dri.h	5 Jan 2005 13:45:10 -0000	1.6
>+++ src/mesa/drivers/dri/unichrome/via_dri.h	31 Jan 2005 01:29:04 -0000
>@@ -1,7 +1,7 @@
> #ifndef _VIA_DRI_
> #define _VIA_DRI_
> 
>-#include "xf86drm.h"
>+#include <libdrm.h>
> 
> #define VIA_MAX_DRAWABLES 256
> 
>Index: src/mesa/drivers/dri/unichrome/via_fb.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/unichrome/via_fb.c,v
>retrieving revision 1.9
>diff -u -d -r1.9 via_fb.c
>--- src/mesa/drivers/dri/unichrome/via_fb.c	21 Jan 2005 09:50:48 -0000	1.9
>+++ src/mesa/drivers/dri/unichrome/via_fb.c	31 Jan 2005 01:29:04 -0000
>@@ -27,7 +27,6 @@
> #include "via_context.h"
> #include "via_ioctl.h"
> #include "via_fb.h"
>-#include "xf86drm.h"
> #include <sys/ioctl.h>
> 
> GLboolean
>Index: src/mesa/drivers/dri/unichrome/via_ioctl.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/unichrome/via_ioctl.c,v
>retrieving revision 1.30
>diff -u -d -r1.30 via_ioctl.c
>--- src/mesa/drivers/dri/unichrome/via_ioctl.c	14 Jan 2005 13:10:50 -0000	1.30
>+++ src/mesa/drivers/dri/unichrome/via_ioctl.c	31 Jan 2005 01:29:04 -0000
>@@ -37,8 +37,7 @@
> #include "via_state.h"
> 
> #include "vblank.h"
>-#include "drm.h"
>-#include "xf86drm.h"
>+#include <libdrm.h>
> #include <sys/ioctl.h>
> #include <errno.h>
> 
>Index: src/mesa/drivers/dri/x11/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/x11/Makefile,v
>retrieving revision 1.6
>diff -u -d -r1.6 Makefile
>--- src/mesa/drivers/dri/x11/Makefile	11 Jan 2005 22:43:45 -0000	1.6
>+++ src/mesa/drivers/dri/x11/Makefile	31 Jan 2005 01:29:04 -0000
>@@ -28,7 +28,6 @@
> 	-I../dri_client/imports \
> 	-Iserver \
> 	-I$(TOP)/include \
>-	-I$(DRM_SOURCE_PATH)/shared \
> 	-I$(TOP)/src/mesa \
> 	-I$(TOP)/src/mesa/main \
> 	-I$(TOP)/src/mesa/glapi \

Actions: View | Splinter Review

Attachments on bug 2426: 1793

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.