head	1.2;
access;
symbols
	netbsd-5-2-3-RELEASE:1.1.1.1.2.1
	netbsd-5-1-5-RELEASE:1.1.1.1.2.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2
	riastradh-drm2-base:1.2
	netbsd-5-2-2-RELEASE:1.1.1.1.2.1
	netbsd-5-1-4-RELEASE:1.1.1.1.2.1
	netbsd-5-2-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1-3-RELEASE:1.1.1.1.2.1
	netbsd-5-2:1.1.1.1.2.1.0.4
	netbsd-5-2-RELEASE:1.1.1.1.2.1
	netbsd-5-2-RC1:1.1.1.1.2.1
	netbsd-5-1-2-RELEASE:1.1.1.1.2.1
	netbsd-5-1-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1:1.1.1.1.2.1.0.2
	netbsd-5-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1-RC4:1.1.1.1.2.1
	netbsd-5-1-RC3:1.1.1.1.2.1
	netbsd-5-1-RC2:1.1.1.1.2.1
	netbsd-5-1-RC1:1.1.1.1.2.1
	netbsd-5-0-2-RELEASE:1.1.1.1
	netbsd-5-0-1-RELEASE:1.1.1.1
	netbsd-5-0:1.1.1.1.0.4
	netbsd-5-0-RELEASE:1.1.1.1
	netbsd-5-0-RC4:1.1.1.1
	netbsd-5-0-RC3:1.1.1.1
	netbsd-5-0-RC2:1.1.1.1
	netbsd-5-0-RC1:1.1.1.1
	netbsd-5:1.1.1.1.0.2
	netbsd-5-base:1.1.1.1
	xorg-server-1-4-2:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2009.06.11.02.13.33;	author mrg;	state dead;
branches;
next	1.1;

1.1
date	2008.07.31.19.50.59;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2008.07.31.19.50.59;	author mrg;	state Exp;
branches
	1.1.1.1.2.1;
next	;

1.1.1.1.2.1
date	2009.09.17.03.34.51;	author snj;	state dead;
branches;
next	;


desc
@@


1.2
log
@merge xorg-server 1.6.1.190.

XXX: our Pci.[ch] changes need to be re-looked at, i think.
@
text
@libcfb_gen_sources = cfbseg.c cfbfillarcC.c cfbfillarcG.c cfbzerarcC.c cfbzerarcX.c cfbzerarcG.c \
	cfbbltC.c cfbbltX.c cfbbltO.c cfbbltG.c cfbsolidC.c cfbsolidX.c cfbsolidG.c cfbtileoddC.c \
	cfbtileoddG.c cfbtile32C.c cfbtile32G.c cfb8lineCO.c cfb8lineCP.c cfb8lineX.c cfb8lineG.c \
	cfb8segCS.c cfb8segC.c cfb8segX.c cfb8setG.c cfbply1rctC.c cfbply1rctG.c

DISTCLEANFILES = $(libcfb_gen_sources)

CFB_INCLUDES = -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb

libcfb_common_sources =  $(top_srcdir)/cfb/cfbgc.c $(top_srcdir)/cfb/cfbrrop.c \
	$(top_srcdir)/cfb/cfbwindow.c $(top_srcdir)/cfb/cfbpntwin.c \
	$(top_srcdir)/cfb/cfbmskbits.c $(top_srcdir)/cfb/cfbpixmap.c \
	$(top_srcdir)/cfb/cfbbitblt.c $(top_srcdir)/cfb/cfbfillsp.c \
	$(top_srcdir)/cfb/cfbsetsp.c $(top_srcdir)/cfb/cfbscrinit.c \
	$(top_srcdir)/cfb/cfballpriv.c $(top_srcdir)/cfb/cfbgetsp.c \
	$(top_srcdir)/cfb/cfbfillrct.c $(top_srcdir)/cfb/cfbigblt8.c \
	$(top_srcdir)/cfb/cfbglblt8.c $(top_srcdir)/cfb/cfbtegblt.c \
	$(top_srcdir)/cfb/cfbbstore.c $(top_srcdir)/cfb/cfbpolypnt.c \
	$(top_srcdir)/cfb/cfbbres.c $(top_srcdir)/cfb/cfbline.c \
	$(top_srcdir)/cfb/cfbhrzvert.c $(top_srcdir)/cfb/cfbbresd.c \
	$(top_srcdir)/cfb/cfbimage.c $(top_srcdir)/cfb/cfbcppl.c \
	$(top_srcdir)/cfb/cfbcmap.c

cfbseg.c:
	echo "#define POLYSEGMENT" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbline.c\"" >> $@@

cfbfillarcC.c:
	echo "#define RROP GXcopy" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbfillarc.c\"" >> $@@

cfbfillarcG.c:
	echo "#define RROP GXset" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbfillarc.c\"" >> $@@

cfbzerarcC.c:
	echo "#define RROP GXcopy" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbzerarc.c\"" >> $@@

cfbzerarcX.c:
	echo "#define RROP GXxor" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbzerarc.c\"" >> $@@

cfbzerarcG.c:
	echo "#define RROP GXset" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbzerarc.c\"" >> $@@

cfbbltC.c:
	echo "#define MROP Mcopy" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbblt.c\"" >> $@@

cfbbltX.c:
	echo "#define MROP Mxor" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbblt.c\"" >> $@@

cfbbltO.c:
	echo "#define MROP Mor" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbblt.c\"" >> $@@

cfbbltG.c:
	echo "#define MROP 0" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbblt.c\"" >> $@@

cfbsolidC.c:
	echo "#define RROP GXcopy" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbsolid.c\"" >> $@@

cfbsolidX.c:
	echo "#define RROP GXxor" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbsolid.c\"" >> $@@

cfbsolidG.c:
	echo "#define RROP GXset" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbsolid.c\"" >> $@@

cfbtileoddC.c:
	echo "#define MROP Mcopy" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbtileodd.c\"" >> $@@

cfbtileoddG.c:
	echo "#define MROP 0" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbtileodd.c\"" >> $@@

cfbtile32C.c:
	echo "#define MROP Mcopy" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbtile32.c\"" >> $@@

cfbtile32G.c:
	echo "#define MROP 0" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbtile32.c\"" >> $@@

cfb8lineCO.c:
	echo "#define RROP GXcopy" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@@

cfb8lineCP.c:
	echo "#define RROP GXcopy" > $@@
	echo "#define PREVIOUS" >> $@@
	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@@

cfb8lineX.c:
	echo "#define RROP GXxor" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@@

cfb8lineG.c:
	echo "#define RROP GXset" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@@

cfb8segCS.c:
	echo "#define RROP GXcopy" > $@@
	echo "#define POLYSEGMENT" >> $@@
	echo "#define WIDTH_SHIFT" >> $@@
	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@@

cfb8segC.c:
	echo "#define RROP GXcopy" > $@@
	echo "#define POLYSEGMENT" >> $@@
	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@@

cfb8segX.c:
	echo "#define RROP GXxor" > $@@
	echo "#define POLYSEGMENT" >> $@@
	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@@

cfb8setG.c:
	echo "#define RROP GXset" > $@@
	echo "#define POLYSEGMENT" >> $@@
	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@@

cfbply1rctC.c:
	echo "#define RROP GXcopy" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbply1rct.c\"" >> $@@

cfbply1rctG.c:
	echo "#define RROP GXset" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbply1rct.c\"" >> $@@

cfbglrop8.c:
	echo "#define GLYPHROP" > $@@
	echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@@


if XPRINT

PLATFORMDEFS = -DXFREE86

cfb8bit.o:   compiler.h

compiler.h:
	echo "#include \"$(top_srcdir)/hw/xfree86/common/compiler.h\"" >> $@@

endif

@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@initial import of xorg-server-1.4.2
@
text
@@


1.1.1.1.2.1
log
@Apply patch (requested by mrg in ticket #958):
Bring over X.Org updates from HEAD.
@
text
@@