debrix-driver-i810/i810 Imakefile, 1.5, 1.6 Makefile.am, NONE, 1.1 i810_driver.c, 1.4, 1.5 i810_hwmc.c, 1.3, 1.4 i810_video.c, 1.2, 1.3 i830_driver.c, 1.3, 1.4 i830_video.c, 1.3, 1.4
Daniel Stone <xserver-commit-u7BhqnqprCWvj1b/[email protected]>
| Newsgroups | gmane.comp.freedesktop.xserver.cvs |
|---|---|
| Message-ID | <[email protected]> |
Committed by: daniel
Update of /cvs/xserver/debrix-driver-i810/i810
In directory pdx:/tmp/cvs-serv16546/i810
Modified Files:
Imakefile i810_driver.c i810_hwmc.c i810_video.c i830_driver.c
i830_video.c
Added Files:
Makefile.am
Log Message:
Initial import of drivers, including client-side XvMC driver.
Index: Imakefile
===================================================================
RCS file: /cvs/xserver/debrix-driver-i810/i810/Imakefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Imakefile 22 Jun 2004 14:28:46 -0000 1.5
+++ Imakefile 28 Jun 2004 01:44:36 -0000 1.6
@@ -1,127 +1,43 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile,v 1.27 2003/04/21 18:56:48 sven Exp $
-XCOMM
-XCOMM This is the Imakefile for the i810 driver.
-XCOMM
-
-#define IHaveModules
-#include <Server.tmpl>
-
-#ifndef I830Only
-#define I830Only NO
-#endif
-
-#define I830XvSupport YES
-
-#ifndef I830XvSupport
-#define I830XvSupport NO
-#endif
-
-#if BuildXF86DRI
-#if !I830Only
-I810DRISRCS = i810_dri.c i810_hwmc.c
-I810DRIOBJS = i810_dri.o i810_hwmc.o
-#endif
-I830DRISRCS = i830_dri.c
-I830DRIOBJS = i830_dri.o
-DRISRCS = $(I810DRISRCS) $(I830DRISRCS)
-DRIOBJS = $(I810DRIOBJS) $(I830DRIOBJS)
-DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri \
- -I$(TOP)/include -I$(DRMSRCDIR)/shared
-DRIDEFINES = $(GLX_DEFINES)
-#endif
-
-#if I830XvSupport
-I830SRCS1 = i830_video.c
-I830OBJS1 = i830_video.o
-#endif
-
-#if !I830Only
-I810SRCS = i810_cursor.c i810_accel.c i810_memory.c i810_wmark.c i810_dga.c \
- i810_video.c i810_io.c
-I810OBJS = i810_cursor.o i810_accel.o i810_memory.o i810_wmark.o i810_dga.o \
- i810_video.o i810_io.o
-#endif
-I830SRCS = i830_driver.c i830_memory.c i830_cursor.c i830_accel.c i830_io.c \
- i830_dga.c $(I830SRCS1) $(I830SRCS2)
-I830OBJS = i830_driver.o i830_memory.o i830_cursor.o i830_accel.o i830_io.o \
- i830_dga.o $(I830OBJS1) $(I830OBJS2)
-
-SRCS = i810_driver.c \
- $(I810SRCS) $(I830SRCS) $(DRISRCS)
+XCOMM $XFree86: xc/lib/XvMC/hw/i810/Imakefile,v 1.2 2002/10/30 12:52:02 alanh Exp $
+#define DoNormalLib NormalLibXvMC
+#define DoSharedLib SharedLibXvMC
+#define DoDebugLib DebugLibXvMC
+#define DoProfileLib ProfileLibXvMC
+#define LibName I810XvMC
+#define SoRev SOXVMCREV
+#define LibHeaders NO
-OBJS = i810_driver.o \
- $(I810OBJS) $(I830OBJS) $(DRIOBJS)
+#include <Threads.tmpl>
-#if I830Only
-CHIPDEFINES = -DI830_ONLY
+#ifdef SharedXvMCReqs
+REQUIREDLIBS = SharedXvMCReqs
#endif
-#if I830XvSupport
-I830XVDEFINES = -DI830_XV
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
#endif
-#if defined(XF86DriverSDK)
-INCLUDES = -I. -I../../include
-#else
-INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
- -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
- -I$(XF86SRC)/xaa -I$(XF86SRC)/rac \
- -I$(SERVERSRC)/miext/shadow \
- -I$(SERVERSRC)/fb -I$(XF86SRC)/xaa -I$(XF86SRC)/ramdac \
- -I$(XF86SRC)/vgahw -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \
- -I$(XF86SRC)/vbe -I$(XF86SRC)/int10 \
- -I$(XF86SRC)/shadowfb \
- -I$(SERVERSRC)/Xext \
- -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
- -I$(EXTINCSRC) -I$(SERVERSRC)/render \
- $(DRIINCLUDES)
-#endif
-DEFINES = $(DRIDEFINES) $(CHIPDEFINES) $(I830XVDEFINES)
+ DEFINES = $(ALLOC_DEFINES) -DTRUE=1 -DFALSE=0
+ INCLUDES = -I$(XINCLUDESRC) -I$(INCLUDESRC) -I$(XLIBSRC) -I$(EXTINCSRC) \
+ -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/linux/drm/kernel \
+ -I$(XF86DRIVERSRC)/i810
+ SRCS = I810XvMC.c
+ OBJS = I810XvMC.o xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o
+ LINTLIBS = $(LINTXLIB)
-ObjectFromSpecialSource(i830_io, i810_io, -DBUILD_FOR_I830)
-#if MakeHasPosixVariableSubstitutions
-SubdirLibraryRule($(OBJS))
-#endif
+#include <Library.tmpl>
-ModuleObjectRule()
-ObjectModuleTarget(i810,$(OBJS))
+#if defined(LinuxArchitecture)
+OS_SUBDIR = linux
-InstallObjectModule(i810,$(MODULEDIR),drivers)
+LinkSourceFile(xf86drm.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm)
+LinkSourceFile(xf86drmHash.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm)
+LinkSourceFile(xf86drmRandom.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm)
+LinkSourceFile(xf86drmSL.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm)
-#if !defined(XF86DriverSDK)
-InstallModuleManPage(i810)
#endif
DependTarget()
-InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(common.h,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810.h,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_accel.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_common.h,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_cursor.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_dga.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_dri.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_dri.h,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_driver.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_hwmc.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_io.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_memory.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_reg.h,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_video.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_wmark.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i830.h,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i830_accel.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i830_common.h,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i830_cursor.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i830_dga.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i830_dri.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i830_dri.h,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i830_driver.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i830_memory.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i830_video.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(../../../../../../lib/GL/mesa/src/drv/i830/i830_3d_reg.h,$(DRIVERSDKDIR)/drivers/i810)
-
-InstallDriverSDKObjectModule(i810,$(DRIVERSDKMODULEDIR),drivers)
--- NEW FILE: Makefile.am ---
driver_LTLIBRARIES = libi810.la libI810XvMC.la
man_MANS = i810.3
AM_CFLAGS = -DI830_XV
if DRI
DRI_SOURCES = \
i810_dri.c \
i810_hwmc.c \
i830_dri.c
endif
libi810_la_SOURCES = \
i810_accel.c \
i810_cursor.c \
i810_dga.c \
i810_driver.c \
i810_io.c \
i810_memory.c \
i810_video.c \
i810_wmark.c \
i830_driver.c \
i830_memory.c \
i830_cursor.c \
i830_accel.c \
i830_io.c \
i830_dga.c \
i830_video.c \
$(DRI_SOURCES)
libi810_la_LDFLAGS = -version-info 1:3:0
libI810XvMC_la_SOURCES = \
I810XvMC.c
libI810XvMC_la_LDFLAGS = -version-info 1:0:0
i830_io.c: i810_io.c
echo "#define BUILD_FOR_I830" > $@
echo "#include \"$(srcdir)/i810_io.c\"" >> $@
DISTCLEANFILES = i830_io.c
Index: i810_driver.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-i810/i810/i810_driver.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- i810_driver.c 22 Jun 2004 14:28:46 -0000 1.4
+++ i810_driver.c 28 Jun 2004 01:44:36 -0000 1.5
@@ -74,7 +74,7 @@
#include "fb.h"
#include "miscstruct.h"
#include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
#include "vbe.h"
#include "i810.h"
Index: i810_hwmc.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-i810/i810/i810_hwmc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- i810_hwmc.c 16 Jun 2004 09:44:00 -0000 1.3
+++ i810_hwmc.c 28 Jun 2004 01:44:36 -0000 1.4
@@ -50,8 +50,8 @@
#include "xf86xv.h"
#include "xf86xvmc.h"
-#include "Xv.h"
-#include "XvMC.h"
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/XvMC.h>
#include "xaa.h"
#include "xaalocal.h"
#include "dixstruct.h"
Index: i810_video.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-i810/i810/i810_video.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- i810_video.c 23 Apr 2004 19:35:55 -0000 1.2
+++ i810_video.c 28 Jun 2004 01:44:36 -0000 1.3
@@ -46,7 +46,7 @@
#include "i810.h"
#include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
#include "xaa.h"
#include "xaalocal.h"
#include "dixstruct.h"
Index: i830_driver.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-i810/i810/i830_driver.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- i830_driver.c 22 Jun 2004 14:28:46 -0000 1.3
+++ i830_driver.c 28 Jun 2004 01:44:36 -0000 1.4
@@ -164,7 +164,7 @@
#include "fb.h"
#include "miscstruct.h"
#include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
#include "vbe.h"
#include "vbeModes.h"
Index: i830_video.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-i810/i810/i830_video.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- i830_video.c 22 Jun 2004 14:28:46 -0000 1.3
+++ i830_video.c 28 Jun 2004 01:44:36 -0000 1.4
@@ -72,7 +72,7 @@
#include "i830.h"
#include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
#include "xaa.h"
#include "xaalocal.h"
#include "dixstruct.h"