summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/cfb
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/cfb')
-rw-r--r--xc/programs/Xserver/cfb/Imakefile277
-rw-r--r--xc/programs/Xserver/cfb/Imakefile.inc292
-rw-r--r--xc/programs/Xserver/cfb/cfb8line.c62
-rw-r--r--xc/programs/Xserver/cfb/cfbhrzvert.c92
-rw-r--r--xc/programs/Xserver/cfb/cfbpntwin.c74
-rw-r--r--xc/programs/Xserver/cfb/cfbsolid.c107
-rw-r--r--xc/programs/Xserver/cfb/module/Imakefile8
7 files changed, 522 insertions, 390 deletions
diff --git a/xc/programs/Xserver/cfb/Imakefile b/xc/programs/Xserver/cfb/Imakefile
index b80cf6237..4ad471e5d 100644
--- a/xc/programs/Xserver/cfb/Imakefile
+++ b/xc/programs/Xserver/cfb/Imakefile
@@ -1,279 +1,6 @@
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:12 cpqbld Exp $
+XCOMM $XFree86: xc/programs/Xserver/cfb/Imakefile,v 3.28 2002/05/31 16:12:18 dawes Exp $
-
-
-XCOMM $XFree86: xc/programs/Xserver/cfb/Imakefile,v 3.26 2001/01/17 22:36:34 dawes Exp $
-
-#define IHaveModules
-#include <Server.tmpl>
-
-#ifndef PixelSize
#define PixelSize 8
-#endif
-
-#if PixelSize == 8
-/* cfb8cppl.c MUST come last to avoid confusing makedepend */
-PSZSRCS = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c
-PSZOBJS = cfb8bit.o cfbteblt8.o cfbglrop8.o cfbpush8.o cfbrctstp8.o
-#ifdef MipsArchitecture
-#ifndef ArcArchitecture
-#ifndef Mips64Architecture
-STIPPLESRC = stipmips.s stipmipste.s
-STIPPLEOBJ = stipmips.o stipmipste.o
-STIPPLEDEF = -DHAS_STIPPLE_CODE
-#endif
-#endif
-#endif
-#ifdef SparcArchitecture
-STIPPLESRC = stipsparc.s stipsparcte.s
-STIPPLEOBJ = stipsparc.o stipsparcte.o
-STIPPLEDEF = -DHAS_STIPPLE_CODE
-#endif
-#endif
-
-#if PixelSize == 32
-#ifdef SparcArchitecture
-STIPPLESRC = stipsprc32.s stipsprcte32.s
-STIPPLEOBJ = stipsprc32.o stipsprcte32.o
-STIPPLEDEF = -DHAS_STIPPLE_CODE
-#endif
-#endif
-
-#ifdef XFree86Version
-#if DoLoadableServer
-XFMODSRC = cfbmodule.c
-XFMODOBJ = cfbmodule.o
-#endif
-#endif
-
-#if !(DoLoadableServer && defined(LinkDirectory))
-CFBCMAP = cfbcmap.o
-#endif
-
-SRCS = cfbgc.c cfbrrop.c cfbwindow.c \
- cfbpntwin.c cfbmskbits.c cfbpixmap.c cfbbitblt.c \
- cfbfillsp.c cfbsetsp.c cfbscrinit.c cfballpriv.c \
- cfbgetsp.c cfbfillrct.c \
- cfbsolidC.c cfbsolidX.c cfbsolidG.c \
- cfbtileoddC.c cfbtileoddG.c cfbtile32C.c cfbtile32G.c \
- cfbcmap.c cfbzerarcC.c cfbzerarcX.c cfbzerarcG.c \
- cfbfillarcC.c cfbfillarcG.c \
- cfbigblt8.c cfbglblt8.c cfbtegblt.c cfbbstore.c \
- cfbbltC.c cfbbltX.c cfbbltO.c cfbbltG.c \
- cfbpolypnt.c \
- cfbbres.c cfbline.c cfbhrzvert.c cfbbresd.c cfbimage.c cfbseg.c \
- cfb8lineCO.c cfb8lineX.c cfb8lineG.c cfb8lineCP.c \
- cfb8segC.c cfb8segX.c cfb8segG.c cfb8segCS.c \
- cfbply1rctC.c cfbply1rctG.c cfbcppl.c $(PSZSRCS) $(XFMODSRC)
-
-OBJS = cfbgc.o cfbrrop.o cfbwindow.o \
- cfbgetsp.o cfbfillrct.o \
- cfbsolidC.o cfbsolidX.o cfbsolidG.o \
- cfbtileoddC.o cfbtileoddG.o cfbtile32C.o cfbtile32G.o \
- cfbfillsp.o cfbsetsp.o cfbscrinit.o cfballpriv.o \
- cfbpntwin.o cfbmskbits.o cfbpixmap.o \
- $(CFBCMAP) cfbzerarcC.o cfbzerarcX.o cfbzerarcG.o \
- cfbfillarcC.o cfbfillarcG.o \
- cfbigblt8.o cfbglblt8.o cfbtegblt.o cfbbstore.o \
- cfbpolypnt.o \
- cfbbres.o cfbline.o cfbhrzvert.o cfbbresd.o cfbimage.o cfbseg.o \
- cfb8lineCO.o cfb8lineX.o cfb8lineG.o cfb8lineCP.o \
- cfb8segCS.o cfb8segX.o cfb8segG.o cfb8segC.o \
- cfbbitblt.o cfbbltC.o cfbbltX.o cfbbltO.o cfbbltG.o \
- cfbply1rctC.o cfbply1rctG.o cfbcppl.o $(PSZOBJS) $(STIPPLEOBJ) \
- $(XFMODOBJ)
-
-#ifdef XFree86Version
-PLATFORMDEFS = -DXFREE86
-#endif
-
-#if BuildLowMem
- LMDEFINES = -ULOWMEMFTPT
-#endif
-
- INCLUDES = -I. -I../cfb -I../mfb -I../mi -I../include -I$(XINCLUDESRC) \
- -I$(FONTINCSRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext
- LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln \
- ../mfb/llib-lmfb.ln ../mi/llib-lmi.ln
- DEFINES = $(LMDEFINES) -DPSZ=PixelSize $(PLATFORMDEFS)
-
-#if PixelSize == 8
-CFBNAME = cfb
-#elif PixelSize == 16
-CFBNAME = cfb16
-#elif PixelSize == 24
-CFBNAME = cfb24
-#elif PixelSize == 32
-CFBNAME = cfb32
-#endif
-
-ModuleObjectRule()
-LibraryModuleTarget($(CFBNAME),$(OBJS))
-
-LintLibraryTarget($(CFBNAME),$(SRCS))
-
-NormalLintTarget($(SRCS))
-
-#ifdef LinkDirectory
-
-LinkSourceFile(cfb.h,LinkDirectory)
-LinkSourceFile(cfbmap.h,LinkDirectory)
-LinkSourceFile(cfballpriv.c,LinkDirectory)
-LinkSourceFile(cfbbitblt.c,LinkDirectory)
-LinkSourceFile(cfbblt.c,LinkDirectory)
-LinkSourceFile(cfbbres.c,LinkDirectory)
-LinkSourceFile(cfbbresd.c,LinkDirectory)
-LinkSourceFile(cfbbstore.c,LinkDirectory)
-LinkSourceFile(cfbcmap.c,LinkDirectory)
-LinkSourceFile(cfbcppl.c,LinkDirectory)
-LinkSourceFile(cfbfillarc.c,LinkDirectory)
-LinkSourceFile(cfbfillrct.c,LinkDirectory)
-LinkSourceFile(cfbfillsp.c,LinkDirectory)
-LinkSourceFile(cfbgc.c,LinkDirectory)
-LinkSourceFile(cfbgetsp.c,LinkDirectory)
-LinkSourceFile(cfbhrzvert.c,LinkDirectory)
-LinkSourceFile(cfbimage.c,LinkDirectory)
-LinkSourceFile(cfbline.c,LinkDirectory)
-LinkSourceFile(cfb8line.c,LinkDirectory)
-LinkSourceFile(cfbmskbits.c,LinkDirectory)
-LinkSourceFile(cfbmskbits.h,LinkDirectory)
-LinkSourceFile(cfbpixmap.c,LinkDirectory)
-LinkSourceFile(cfbply1rct.c,LinkDirectory)
-LinkSourceFile(cfbpntwin.c,LinkDirectory)
-LinkSourceFile(cfbpolypnt.c,LinkDirectory)
-LinkSourceFile(cfbrrop.c,LinkDirectory)
-LinkSourceFile(cfbrrop.h,LinkDirectory)
-LinkSourceFile(cfbscrinit.c,LinkDirectory)
-LinkSourceFile(cfbsetsp.c,LinkDirectory)
-LinkSourceFile(cfbsolid.c,LinkDirectory)
-LinkSourceFile(cfbigblt8.c,LinkDirectory)
-LinkSourceFile(cfbglblt8.c,LinkDirectory)
-LinkSourceFile(cfbtegblt.c,LinkDirectory)
-LinkSourceFile(cfbtileodd.c,LinkDirectory)
-LinkSourceFile(cfbtile32.c,LinkDirectory)
-LinkSourceFile(cfbwindow.c,LinkDirectory)
-LinkSourceFile(cfbzerarc.c,LinkDirectory)
-LinkSourceFile(cfb8bit.h,LinkDirectory)
-#if PixelSize == 8
-LinkSourceFile(cfb8bit.c,LinkDirectory)
-LinkSourceFile(cfb8cppl.c,LinkDirectory)
-LinkSourceFile(cfbpush8.c,LinkDirectory)
-LinkSourceFile(cfbrctstp8.c,LinkDirectory)
-LinkSourceFile(cfbteblt8.c,LinkDirectory)
-#ifdef MipsArchitecture
-LinkSourceFile(stipmips.s,LinkDirectory)
-#endif
-#ifdef SparcArchitecture
-LinkSourceFile(stipsparc.s,LinkDirectory)
-#endif
-#endif
-#if PixelSize == 32
-#ifdef SparcArchitecture
-LinkSourceFile(stipsprc32.s,LinkDirectory)
-#endif
-#endif
-#endif
-
-ObjectFromSpecialSource(cfbseg,cfbline,-DPOLYSEGMENT)
-
-ObjectFromSpecialSource(cfbfillarcC,cfbfillarc,-DRROP=GXcopy)
-ObjectFromSpecialSource(cfbfillarcG,cfbfillarc,-DRROP=GXset)
-
-ObjectFromSpecialSource(cfbzerarcC,cfbzerarc,-DRROP=GXcopy)
-ObjectFromSpecialSource(cfbzerarcX,cfbzerarc,-DRROP=GXxor)
-ObjectFromSpecialSource(cfbzerarcG,cfbzerarc,-DRROP=GXset)
-
-ObjectFromSpecialSource(cfbbltC,cfbblt,-DMROP=Mcopy)
-ObjectFromSpecialSource(cfbbltX,cfbblt,-DMROP=Mxor)
-ObjectFromSpecialSource(cfbbltO,cfbblt,-DMROP=Mor)
-ObjectFromSpecialSource(cfbbltG,cfbblt,-DMROP=0)
-
-ObjectFromSpecialSource(cfbsolidC,cfbsolid,-DRROP=GXcopy)
-ObjectFromSpecialSource(cfbsolidX,cfbsolid,-DRROP=GXxor)
-ObjectFromSpecialSource(cfbsolidG,cfbsolid,-DRROP=GXset)
-
-ObjectFromSpecialSource(cfbtileoddC,cfbtileodd,-DMROP=Mcopy)
-ObjectFromSpecialSource(cfbtileoddG,cfbtileodd,-DMROP=0)
-
-ObjectFromSpecialSource(cfbtile32C,cfbtile32,-DMROP=Mcopy)
-ObjectFromSpecialSource(cfbtile32G,cfbtile32,-DMROP=0)
-
-ObjectFromSpecialSource(cfb8lineCO,cfb8line,-DRROP=GXcopy)
-ObjectFromSpecialSource(cfb8lineCP,cfb8line,-DRROP=GXcopy -DPREVIOUS)
-ObjectFromSpecialSource(cfb8lineX,cfb8line,-DRROP=GXxor)
-ObjectFromSpecialSource(cfb8lineG,cfb8line,-DRROP=GXset)
-
-ObjectFromSpecialSource(cfb8segCS,cfb8line,-DRROP=GXcopy -DPOLYSEGMENT -DWIDTH_SHIFT)
-ObjectFromSpecialSource(cfb8segC,cfb8line,-DRROP=GXcopy -DPOLYSEGMENT)
-ObjectFromSpecialSource(cfb8segX,cfb8line,-DRROP=GXxor -DPOLYSEGMENT)
-ObjectFromSpecialSource(cfb8segG,cfb8line,-DRROP=GXset -DPOLYSEGMENT)
-
-ObjectFromSpecialSource(cfbply1rctC,cfbply1rct,-DRROP=GXcopy)
-ObjectFromSpecialSource(cfbply1rctG,cfbply1rct,-DRROP=GXset)
-
-SpecialCObjectRule(cfbglblt8,$(_NOOP_),$(STIPPLEDEF))
-SpecialCObjectRule(cfbpixmap,$(ICONFIGFILES),$(_NOOP_))
-SpecialCObjectRule(cfbcmap,$(ICONFIGFILES),$(EXT_DEFINES) $(GLX_DEFINES))
-
-#if PixelSize == 8
-ObjectFromSpecialSource(cfbglrop8,cfbglblt8,-DGLYPHROP)
-
-#ifdef MipsArchitecture
-stipmipste.s: stipmips.s
- $(RM) $@
- $(LN) stipmips.s stipmipste.s
-clean::
- $(RM) stipmipste.s
-
-stipmipste.o: stipmipste.s
- $(AS) -o $@ -DTETEXT stipmipste.s
-#endif
-
-#ifdef SparcArchitecture
-stipsparcte.s: stipsparc.s
- $(RM) $@
- $(LN) stipsparc.s stipsparcte.s
-clean::
- $(RM) stipsparcte.s
-
-stipsparc.o: stipsparc.s
- $(CPP) stipsparc.s AsmDefines | $(AS) -o $@ -
-
-stipsparcte.o: stipsparcte.s
- $(CPP) -DTETEXT stipsparcte.s AsmDefines | $(AS) -o $@ -
-#endif
-#endif
-
-#if PixelSize == 32
-#ifdef SparcArchitecture
-stipsprcte32.s: stipsprc32.s
- $(RM) $@
- $(LN) stipsprc32.s stipsprcte32.s
-clean::
- $(RM) stipsprcte32.s
-
-stipsprc32.o: stipsprc32.s
- $(CPP) stipsprc32.s AsmDefines | $(AS) -o $@ -
-
-stipsprcte32.o: stipsprcte32.s
- $(CPP) -DTETEXT stipsprcte32.s AsmDefines | $(AS) -o $@ -
-#endif
-#endif
-
-InstallLibraryModule($(CFBNAME),$(MODULEDIR),.)
-
-#ifndef OS2Architecture
-DependTarget()
-#endif
-
-InstallDriverSDKLibraryModule($(CFBNAME),$(DRIVERSDKMODULEDIR),.)
+#include "Imakefile.inc"
-#if PixelSize == 8
-InstallDriverSDKNonExecFile(cfb.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(cfb16.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(cfb24.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(cfb32.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(cfbmap.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(cfbunmap.h,$(DRIVERSDKINCLUDEDIR))
-#endif
diff --git a/xc/programs/Xserver/cfb/Imakefile.inc b/xc/programs/Xserver/cfb/Imakefile.inc
new file mode 100644
index 000000000..f1baec659
--- /dev/null
+++ b/xc/programs/Xserver/cfb/Imakefile.inc
@@ -0,0 +1,292 @@
+XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:12 cpqbld Exp $
+
+
+
+XCOMM $XFree86: xc/programs/Xserver/cfb/Imakefile.inc,v 1.3 2002/06/02 01:21:16 dawes Exp $
+
+#if DoLoadableServer
+#if !BuildModuleInSubdir
+#define IHaveModules
+#elif !defined(IHaveModules)
+#define IHaveSubdirs
+SUBDIRS = module
+#endif
+#endif
+
+#include <Server.tmpl>
+
+#ifndef PixelSize
+#define PixelSize 8
+#endif
+
+#if PixelSize == 8
+PSZSRCS = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c
+PSZOBJS = cfb8bit.o cfbteblt8.o cfbglrop8.o cfbpush8.o cfbrctstp8.o
+#ifdef MipsArchitecture
+#ifndef ArcArchitecture
+#ifndef Mips64Architecture
+STIPPLESRC = stipmips.s stipmipste.s
+STIPPLEOBJ = stipmips.o stipmipste.o
+STIPPLEDEF = -DHAS_STIPPLE_CODE
+#endif
+#endif
+#endif
+#ifdef SparcArchitecture
+STIPPLESRC = stipsparc.s stipsparcte.s
+STIPPLEOBJ = stipsparc.o stipsparcte.o
+STIPPLEDEF = -DHAS_STIPPLE_CODE
+#endif
+#endif
+
+#if PixelSize == 32
+#ifdef SparcArchitecture
+STIPPLESRC = stipsprc32.s stipsprcte32.s
+STIPPLEOBJ = stipsprc32.o stipsprcte32.o
+STIPPLEDEF = -DHAS_STIPPLE_CODE
+#endif
+#endif
+
+#if defined(IHaveModules)
+XFMODSRC = cfbmodule.c
+XFMODOBJ = cfbmodule.o
+#endif
+
+#if !(defined(IHaveModules) && defined(LinkDirectory))
+CFBCMAP = cfbcmap.o
+#endif
+
+SRCS = cfbgc.c cfbrrop.c cfbwindow.c \
+ cfbpntwin.c cfbmskbits.c cfbpixmap.c cfbbitblt.c \
+ cfbfillsp.c cfbsetsp.c cfbscrinit.c cfballpriv.c \
+ cfbgetsp.c cfbfillrct.c \
+ cfbsolidC.c cfbsolidX.c cfbsolidG.c \
+ cfbtileoddC.c cfbtileoddG.c cfbtile32C.c cfbtile32G.c \
+ cfbcmap.c cfbzerarcC.c cfbzerarcX.c cfbzerarcG.c \
+ cfbfillarcC.c cfbfillarcG.c \
+ cfbigblt8.c cfbglblt8.c cfbtegblt.c cfbbstore.c \
+ cfbbltC.c cfbbltX.c cfbbltO.c cfbbltG.c \
+ cfbpolypnt.c \
+ cfbbres.c cfbline.c cfbhrzvert.c cfbbresd.c cfbimage.c cfbseg.c \
+ cfb8lineCO.c cfb8lineX.c cfb8lineG.c cfb8lineCP.c \
+ cfb8segC.c cfb8segX.c cfb8segG.c cfb8segCS.c \
+ cfbply1rctC.c cfbply1rctG.c cfbcppl.c $(PSZSRCS) $(XFMODSRC)
+
+OBJS = cfbgc.o cfbrrop.o cfbwindow.o \
+ cfbgetsp.o cfbfillrct.o \
+ cfbsolidC.o cfbsolidX.o cfbsolidG.o \
+ cfbtileoddC.o cfbtileoddG.o cfbtile32C.o cfbtile32G.o \
+ cfbfillsp.o cfbsetsp.o cfbscrinit.o cfballpriv.o \
+ cfbpntwin.o cfbmskbits.o cfbpixmap.o \
+ $(CFBCMAP) cfbzerarcC.o cfbzerarcX.o cfbzerarcG.o \
+ cfbfillarcC.o cfbfillarcG.o \
+ cfbigblt8.o cfbglblt8.o cfbtegblt.o cfbbstore.o \
+ cfbpolypnt.o \
+ cfbbres.o cfbline.o cfbhrzvert.o cfbbresd.o cfbimage.o cfbseg.o \
+ cfb8lineCO.o cfb8lineX.o cfb8lineG.o cfb8lineCP.o \
+ cfb8segCS.o cfb8segX.o cfb8segG.o cfb8segC.o \
+ cfbbitblt.o cfbbltC.o cfbbltX.o cfbbltO.o cfbbltG.o \
+ cfbply1rctC.o cfbply1rctG.o cfbcppl.o $(PSZOBJS) $(STIPPLEOBJ) \
+ $(XFMODOBJ)
+
+#ifdef XFree86Version
+PLATFORMDEFS = -DXFREE86
+#endif
+
+#if BuildLowMem
+ LMDEFINES = -ULOWMEMFTPT
+#endif
+
+ INCLUDES = -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
+ -I$(SERVERSRC)/cfb24 -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
+ -I$(FONTINCSRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext
+ LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln \
+ $(SERVERSRC)/mfb/llib-lmfb.ln $(SERVERSRC)/mi/llib-lmi.ln
+ DEFINES = $(LMDEFINES) -DPSZ=PixelSize $(PLATFORMDEFS)
+
+#if PixelSize == 8
+CFBNAME = cfb
+#elif PixelSize == 16
+CFBNAME = cfb16
+#elif PixelSize == 24
+CFBNAME = cfb24
+#elif PixelSize == 32
+CFBNAME = cfb32
+#endif
+
+#ifdef IHaveModules
+ModuleObjectRule()
+LibraryModuleTarget($(CFBNAME),$(OBJS))
+#else
+NormalLibraryObjectRule()
+NormalLibraryTarget($(CFBNAME),$(OBJS))
+#endif
+
+LintLibraryTarget($(CFBNAME),$(SRCS))
+
+NormalLintTarget($(SRCS))
+
+#ifdef LinkDirectory
+
+LinkSourceFile(cfballpriv.c,LinkDirectory)
+LinkSourceFile(cfbbitblt.c,LinkDirectory)
+LinkSourceFile(cfbblt.c,LinkDirectory)
+LinkSourceFile(cfbbres.c,LinkDirectory)
+LinkSourceFile(cfbbresd.c,LinkDirectory)
+LinkSourceFile(cfbbstore.c,LinkDirectory)
+LinkSourceFile(cfbcmap.c,LinkDirectory)
+LinkSourceFile(cfbcppl.c,LinkDirectory)
+LinkSourceFile(cfbfillarc.c,LinkDirectory)
+LinkSourceFile(cfbfillrct.c,LinkDirectory)
+LinkSourceFile(cfbfillsp.c,LinkDirectory)
+LinkSourceFile(cfbgc.c,LinkDirectory)
+LinkSourceFile(cfbgetsp.c,LinkDirectory)
+LinkSourceFile(cfbhrzvert.c,LinkDirectory)
+LinkSourceFile(cfbimage.c,LinkDirectory)
+LinkSourceFile(cfbline.c,LinkDirectory)
+LinkSourceFile(cfb8line.c,LinkDirectory)
+LinkSourceFile(cfbmskbits.c,LinkDirectory)
+LinkSourceFile(cfbpixmap.c,LinkDirectory)
+LinkSourceFile(cfbply1rct.c,LinkDirectory)
+LinkSourceFile(cfbpntwin.c,LinkDirectory)
+LinkSourceFile(cfbpolypnt.c,LinkDirectory)
+LinkSourceFile(cfbrrop.c,LinkDirectory)
+LinkSourceFile(cfbscrinit.c,LinkDirectory)
+LinkSourceFile(cfbsetsp.c,LinkDirectory)
+LinkSourceFile(cfbsolid.c,LinkDirectory)
+LinkSourceFile(cfbigblt8.c,LinkDirectory)
+LinkSourceFile(cfbglblt8.c,LinkDirectory)
+LinkSourceFile(cfbtegblt.c,LinkDirectory)
+LinkSourceFile(cfbtileodd.c,LinkDirectory)
+LinkSourceFile(cfbtile32.c,LinkDirectory)
+LinkSourceFile(cfbwindow.c,LinkDirectory)
+LinkSourceFile(cfbzerarc.c,LinkDirectory)
+#if PixelSize == 8
+LinkSourceFile(cfb8bit.c,LinkDirectory)
+LinkSourceFile(cfbpush8.c,LinkDirectory)
+LinkSourceFile(cfbrctstp8.c,LinkDirectory)
+LinkSourceFile(cfbteblt8.c,LinkDirectory)
+#ifdef MipsArchitecture
+LinkSourceFile(stipmips.s,LinkDirectory)
+#endif
+#ifdef SparcArchitecture
+LinkSourceFile(stipsparc.s,LinkDirectory)
+#endif
+#endif
+#if PixelSize == 32
+#ifdef SparcArchitecture
+LinkSourceFile(stipsprc32.s,LinkDirectory)
+#endif
+#endif
+#endif
+
+#if BuildModuleInSubdir && defined(IHaveModules)
+LinkSourceFile(cfbmodule.c,..)
+#endif
+
+ObjectFromSpecialSource(cfbseg,cfbline,-DPOLYSEGMENT)
+
+ObjectFromSpecialSource(cfbfillarcC,cfbfillarc,-DRROP=GXcopy)
+ObjectFromSpecialSource(cfbfillarcG,cfbfillarc,-DRROP=GXset)
+
+ObjectFromSpecialSource(cfbzerarcC,cfbzerarc,-DRROP=GXcopy)
+ObjectFromSpecialSource(cfbzerarcX,cfbzerarc,-DRROP=GXxor)
+ObjectFromSpecialSource(cfbzerarcG,cfbzerarc,-DRROP=GXset)
+
+ObjectFromSpecialSource(cfbbltC,cfbblt,-DMROP=Mcopy)
+ObjectFromSpecialSource(cfbbltX,cfbblt,-DMROP=Mxor)
+ObjectFromSpecialSource(cfbbltO,cfbblt,-DMROP=Mor)
+ObjectFromSpecialSource(cfbbltG,cfbblt,-DMROP=0)
+
+ObjectFromSpecialSource(cfbsolidC,cfbsolid,-DRROP=GXcopy)
+ObjectFromSpecialSource(cfbsolidX,cfbsolid,-DRROP=GXxor)
+ObjectFromSpecialSource(cfbsolidG,cfbsolid,-DRROP=GXset)
+
+ObjectFromSpecialSource(cfbtileoddC,cfbtileodd,-DMROP=Mcopy)
+ObjectFromSpecialSource(cfbtileoddG,cfbtileodd,-DMROP=0)
+
+ObjectFromSpecialSource(cfbtile32C,cfbtile32,-DMROP=Mcopy)
+ObjectFromSpecialSource(cfbtile32G,cfbtile32,-DMROP=0)
+
+ObjectFromSpecialSource(cfb8lineCO,cfb8line,-DRROP=GXcopy)
+ObjectFromSpecialSource(cfb8lineCP,cfb8line,-DRROP=GXcopy -DPREVIOUS)
+ObjectFromSpecialSource(cfb8lineX,cfb8line,-DRROP=GXxor)
+ObjectFromSpecialSource(cfb8lineG,cfb8line,-DRROP=GXset)
+
+ObjectFromSpecialSource(cfb8segCS,cfb8line,-DRROP=GXcopy -DPOLYSEGMENT -DWIDTH_SHIFT)
+ObjectFromSpecialSource(cfb8segC,cfb8line,-DRROP=GXcopy -DPOLYSEGMENT)
+ObjectFromSpecialSource(cfb8segX,cfb8line,-DRROP=GXxor -DPOLYSEGMENT)
+ObjectFromSpecialSource(cfb8segG,cfb8line,-DRROP=GXset -DPOLYSEGMENT)
+
+ObjectFromSpecialSource(cfbply1rctC,cfbply1rct,-DRROP=GXcopy)
+ObjectFromSpecialSource(cfbply1rctG,cfbply1rct,-DRROP=GXset)
+
+SpecialCObjectRule(cfbglblt8,$(_NOOP_),$(STIPPLEDEF))
+SpecialCObjectRule(cfbpixmap,$(ICONFIGFILES),$(_NOOP_))
+SpecialCObjectRule(cfbcmap,$(ICONFIGFILES),$(EXT_DEFINES) $(GLX_DEFINES))
+
+#if PixelSize == 8
+ObjectFromSpecialSource(cfbglrop8,cfbglblt8,-DGLYPHROP)
+
+#ifdef MipsArchitecture
+stipmipste.s: stipmips.s
+ $(RM) $@
+ $(LN) stipmips.s stipmipste.s
+clean::
+ $(RM) stipmipste.s
+
+stipmipste.o: stipmipste.s
+ $(AS) -o $@ -DTETEXT stipmipste.s
+#endif
+
+#ifdef SparcArchitecture
+stipsparcte.s: stipsparc.s
+ $(RM) $@
+ $(LN) stipsparc.s stipsparcte.s
+clean::
+ $(RM) stipsparcte.s
+
+stipsparc.o: stipsparc.s
+ $(CPP) stipsparc.s AsmDefines | $(AS) -o $@ -
+
+stipsparcte.o: stipsparcte.s
+ $(CPP) -DTETEXT stipsparcte.s AsmDefines | $(AS) -o $@ -
+#endif
+#endif
+
+#if PixelSize == 32
+#ifdef SparcArchitecture
+stipsprcte32.s: stipsprc32.s
+ $(RM) $@
+ $(LN) stipsprc32.s stipsprcte32.s
+clean::
+ $(RM) stipsprcte32.s
+
+stipsprc32.o: stipsprc32.s
+ $(CPP) stipsprc32.s AsmDefines | $(AS) -o $@ -
+
+stipsprcte32.o: stipsprcte32.s
+ $(CPP) -DTETEXT stipsprcte32.s AsmDefines | $(AS) -o $@ -
+#endif
+#endif
+
+#ifdef IHaveModules
+InstallLibraryModule($(CFBNAME),$(MODULEDIR),.)
+#endif
+
+DependTarget()
+
+#ifdef IHaveSubdirs
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
+
+InstallDriverSDKLibraryModule($(CFBNAME),$(DRIVERSDKMODULEDIR),.)
+
+#if PixelSize == 8
+InstallDriverSDKNonExecFile(cfb.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(cfb16.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(cfb24.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(cfb32.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(cfbmap.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(cfbunmap.h,$(DRIVERSDKINCLUDEDIR))
+#endif
diff --git a/xc/programs/Xserver/cfb/cfb8line.c b/xc/programs/Xserver/cfb/cfb8line.c
index c933e6892..f06abe084 100644
--- a/xc/programs/Xserver/cfb/cfb8line.c
+++ b/xc/programs/Xserver/cfb/cfb8line.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*
- * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.17 2001/12/14 19:59:20 dawes Exp $
+ * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.18 2002/09/18 17:11:47 tsi Exp $
* Jeff Anton'x fixes: cfb8line.c 97/02/07
*/
@@ -733,16 +733,19 @@ FUNC_NAME(cfb8LineSS1Rect) (pDrawable, pGC, mode, npt, pptInit, pptInitOrig,
*addrp = piQxelXor[2];
break;
case 1:
- *addrp++ = ((*addrp) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
- *addrp++ = piQxelXor[1];
- *addrp = piQxelXor[2];
+ *addrp = ((*addrp) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ addrp++;
+ *addrp = piQxelXor[1];
+ addrp++;
+ *addrp = piQxelXor[2];
break;
case 2:
- *addrp++ =((*addrp) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ *addrp = ((*addrp) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ addrp++;
*addrp = piQxelXor[2];
break;
case 3:
- *addrp =((*addrp) & 0xFF) | (piQxelXor[2] & 0xFFFFFF00);
+ *addrp = ((*addrp) & 0xFF) | (piQxelXor[2] & 0xFFFFFF00);
break;
}
break;
@@ -754,12 +757,15 @@ FUNC_NAME(cfb8LineSS1Rect) (pDrawable, pGC, mode, npt, pptInit, pptInitOrig,
*addrp = ((*addrp) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
break;
case 1:
- *addrp++ = ((*addrp) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
- *addrp++ = piQxelXor[1];
+ *addrp = ((*addrp) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ addrp++;
+ *addrp = piQxelXor[1];
+ addrp++;
*addrp = ((*addrp) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
break;
case 2:
- *addrp++ =((*addrp) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ *addrp = ((*addrp) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ addrp++;
*addrp = ((*addrp) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
break;
}
@@ -768,12 +774,14 @@ FUNC_NAME(cfb8LineSS1Rect) (pDrawable, pGC, mode, npt, pptInit, pptInitOrig,
switch(leftIndex){
/*
case 2:
- *addrp++ = ((*addrp) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ *addrp = ((*addrp) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ addrp++;
*addrp = ((*addrp) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
break;
*/
case 1:
- *addrp++ = ((*addrp) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ *addrp = ((*addrp) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ addrp++;
*addrp = ((*addrp) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
break;
case 0:
@@ -788,7 +796,8 @@ FUNC_NAME(cfb8LineSS1Rect) (pDrawable, pGC, mode, npt, pptInit, pptInitOrig,
}
/*
else{
- *addrp++ = ((*addrp) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ *addrp = ((*addrp) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ addrp++;
*addrp = ((*addrp) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
}
*/
@@ -804,16 +813,22 @@ FUNC_NAME(cfb8LineSS1Rect) (pDrawable, pGC, mode, npt, pptInit, pptInitOrig,
case 0:
break;
case 1:
- *addrp++ = ((*addrp) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
- *addrp++ = piQxelXor[1];
- *addrp++ = piQxelXor[2];
+ *addrp = ((*addrp) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ addrp++;
+ *addrp = piQxelXor[1];
+ addrp++;
+ *addrp = piQxelXor[2];
+ addrp++;
break;
case 2:
- *addrp++ = ((*addrp) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
- *addrp++ = piQxelXor[2];
+ *addrp = ((*addrp) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ addrp++;
+ *addrp = piQxelXor[2];
+ addrp++;
break;
case 3:
- *addrp++ = ((*addrp) & 0xFF) | (piQxelXor[2] & 0xFFFFFF00);
+ *addrp = ((*addrp) & 0xFF) | (piQxelXor[2] & 0xFFFFFF00);
+ addrp++;
break;
}
while(nlmiddle--){
@@ -846,20 +861,23 @@ FUNC_NAME(cfb8LineSS1Rect) (pDrawable, pGC, mode, npt, pptInit, pptInitOrig,
| (piQxelXor[0] & 0xFFFFFF & e3);
break;
case 1:
- *addrp++ = ((*addrp) & (0xFFFFFF | ~(e3<<24)))
- | (piQxelXor[0] & 0xFF000000 & (e3<<24));
+ *addrp = ((*addrp) & (0xFFFFFF | ~(e3<<24)))
+ + (piQxelXor[0] & 0xFF000000 & (e3<<24));
+ addrp++;
*addrp = ((*addrp) & (0xFFFF0000|~(e3 >> 8)))
| (piQxelXor[1] & 0xFFFF & (e3 >> 8));
break;
case 2:
- *addrp++ = ((*addrp) & (0xFFFF|~(e3 << 16)))
+ *addrp = ((*addrp) & (0xFFFF|~(e3 << 16)))
| (piQxelXor[1] & 0xFFFF0000 & (e3 << 16));
+ addrp++;
*addrp = ((*addrp) & (0xFFFFFF00|~(e3>>16)))
| (piQxelXor[2] & 0xFF & (e3 >> 16));
break;
case 3:
- *addrp++ = ((*addrp) & (0xFF|~(e3<<8)))
+ *addrp = ((*addrp) & (0xFF|~(e3<<8)))
| (piQxelXor[2] & 0xFFFFFF00 & (e3<<8));
+ addrp++;
break;
}
}
diff --git a/xc/programs/Xserver/cfb/cfbhrzvert.c b/xc/programs/Xserver/cfb/cfbhrzvert.c
index 3a1ade76c..6f4f7abe6 100644
--- a/xc/programs/Xserver/cfb/cfbhrzvert.c
+++ b/xc/programs/Xserver/cfb/cfbhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.7 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.8 2002/09/16 18:05:30 eich Exp $ */
/***********************************************************
Copyright 1987,1998 The Open Group
@@ -104,18 +104,23 @@ int len; /* length of line */
case 4:
switch(leftIndex){
case 0:
- *addrl++ = DoRRop (*addrl, piQxelAnd[0], piQxelXor[0]);
- *addrl++ = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
- *addrl = DoRRop (*addrl, piQxelAnd[2], piQxelXor[2]);
+ *addrl = DoRRop (*addrl, piQxelAnd[0], piQxelXor[0]);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[2], piQxelXor[2]);
break;
case 1:
- *addrl++ = DoMaskRRop (*addrl, piQxelAnd[0], piQxelXor[0], 0xFF000000);
- *addrl++ = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
- *addrl = DoRRop (*addrl, piQxelAnd[2], piQxelXor[2]);
+ *addrl = DoMaskRRop (*addrl, piQxelAnd[0], piQxelXor[0], 0xFF000000);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[2], piQxelXor[2]);
break;
case 2:
- *addrl++ = DoMaskRRop (*addrl, piQxelAnd[1], piQxelXor[1], 0xFFFF0000);
- *addrl = DoRRop (*addrl, piQxelAnd[2], piQxelXor[2]);
+ *addrl = DoMaskRRop (*addrl, piQxelAnd[1], piQxelXor[1], 0xFFFF0000);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[2], piQxelXor[2]);
break;
case 3:
*addrl = DoMaskRRop (*addrl, piQxelAnd[2], piQxelXor[2], 0xFFFFFF00);
@@ -125,27 +130,34 @@ int len; /* length of line */
case 3:
switch(leftIndex){
case 0:
- *addrl++ = DoRRop (*addrl, piQxelAnd[0], piQxelXor[0]);
- *addrl++ = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
+ *addrl = DoRRop (*addrl, piQxelAnd[0], piQxelXor[0]);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
+ addrl++;
*addrl = DoMaskRRop (*addrl, piQxelAnd[2], piQxelXor[2], 0xFF);
break;
case 1:
- *addrl++ = DoMaskRRop (*addrl, piQxelAnd[0], piQxelXor[0], 0xFF000000);
- *addrl++ = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
+ *addrl = DoMaskRRop (*addrl, piQxelAnd[0], piQxelXor[0], 0xFF000000);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
+ addrl++;
*addrl = DoMaskRRop (*addrl, piQxelAnd[2], piQxelXor[2], 0xFF);
break;
case 2:
- *addrl++ = DoMaskRRop (*addrl, piQxelAnd[1], piQxelXor[1], 0xFFFF0000);
+ *addrl = DoMaskRRop (*addrl, piQxelAnd[1], piQxelXor[1], 0xFFFF0000);
+ addrl++;
*addrl = DoMaskRRop (*addrl, piQxelAnd[2], piQxelXor[2], 0xFF);
break;
}
break;
case 2:
if(leftIndex){
- *addrl++ = DoMaskRRop (*addrl, piQxelAnd[0], piQxelXor[0], 0xFF000000);
+ *addrl = DoMaskRRop (*addrl, piQxelAnd[0], piQxelXor[0], 0xFF000000);
+ addrl++;
}
else{
- *addrl++ = DoRRop (*addrl, piQxelAnd[0], piQxelXor[0]);
+ *addrl = DoRRop (*addrl, piQxelAnd[0], piQxelXor[0]);
+ addrl++;
}
*addrl = DoMaskRRop (*addrl, piQxelAnd[1], piQxelXor[1], 0xFFFF);
break;
@@ -161,16 +173,19 @@ int len; /* length of line */
case 0:
break;
case 1:
- *addrl++ = ((*addrl) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ *addrl = ((*addrl) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ addrl++;
*addrl++ = piQxelXor[1];
*addrl++ = piQxelXor[2];
break;
case 2:
- *addrl++ = ((*addrl) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ *addrl = ((*addrl) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ addrl++;
*addrl++ = piQxelXor[2];
break;
case 3:
- *addrl++ = ((*addrl) & 0xFF) | (piQxelXor[2] & 0xFFFFFF00);
+ *addrl = ((*addrl) & 0xFF) | (piQxelXor[2] & 0xFFFFFF00);
+ addrl++;
break;
}
while(nlmiddle--){
@@ -240,36 +255,49 @@ int len; /* length of line */
case 0:
break;
case 1:
- *addrl++ = DoMaskRRop (*addrl, piQxelAnd[0], piQxelXor[0], 0xFF000000);
- *addrl++ = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
- *addrl++ = DoRRop (*addrl, piQxelAnd[2], piQxelXor[2]);
+ *addrl = DoMaskRRop (*addrl, piQxelAnd[0], piQxelXor[0], 0xFF000000);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[2], piQxelXor[2]);
+ addrl++;
break;
case 2:
- *addrl++ = DoMaskRRop (*addrl, piQxelAnd[1], piQxelXor[1], 0xFFFF0000);
- *addrl++ = DoRRop (*addrl, piQxelAnd[2], piQxelXor[2]);
+ *addrl = DoMaskRRop (*addrl, piQxelAnd[1], piQxelXor[1], 0xFFFF0000);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[2], piQxelXor[2]);
+ addrl++;
break;
case 3:
- *addrl++ = DoMaskRRop (*addrl, piQxelAnd[2], piQxelXor[2], 0xFFFFFF00);
+ *addrl = DoMaskRRop (*addrl, piQxelAnd[2], piQxelXor[2], 0xFFFFFF00);
+ addrl++;
break;
}
while(nlmiddle--){
- *addrl++ = DoRRop (*addrl, piQxelAnd[0], piQxelXor[0]);
- *addrl++ = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
- *addrl++ = DoRRop (*addrl, piQxelAnd[2], piQxelXor[2]);
+ *addrl = DoRRop (*addrl, piQxelAnd[0], piQxelXor[0]);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[2], piQxelXor[2]);
+ addrl++;
}
switch(rightIndex){
case 0:
break;
case 1:
- *addrl++ = DoMaskRRop (*addrl, piQxelAnd[0], piQxelXor[0], 0xFFFFFF);
+ *addrl = DoMaskRRop (*addrl, piQxelAnd[0], piQxelXor[0], 0xFFFFFF);
+ addrl++;
break;
case 2:
- *addrl++ = DoRRop (*addrl, piQxelAnd[0], piQxelXor[0]);
+ *addrl = DoRRop (*addrl, piQxelAnd[0], piQxelXor[0]);
+ addrl++;
*addrl = DoMaskRRop (*addrl, piQxelAnd[1], piQxelXor[1], 0xFFFF);
break;
case 3:
- *addrl++ = DoRRop (*addrl, piQxelAnd[0], piQxelXor[0]);
- *addrl++ = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
+ *addrl = DoRRop (*addrl, piQxelAnd[0], piQxelXor[0]);
+ addrl++;
+ *addrl = DoRRop (*addrl, piQxelAnd[1], piQxelXor[1]);
+ addrl++;
*addrl = DoMaskRRop (*addrl, piQxelAnd[2], piQxelXor[2], 0xFF);
break;
}
diff --git a/xc/programs/Xserver/cfb/cfbpntwin.c b/xc/programs/Xserver/cfb/cfbpntwin.c
index 25aa39f28..d21544b37 100644
--- a/xc/programs/Xserver/cfb/cfbpntwin.c
+++ b/xc/programs/Xserver/cfb/cfbpntwin.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.7 2002/09/16 18:05:31 eich Exp $ */
#include "X.h"
@@ -293,7 +293,8 @@ cfbFillBoxSolid (pDrawable, nBox, pBox, pixel)
break;
case 1:
while(h--){
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ pdst++;
*pdst++ = piQxelArray[1];
*pdst = piQxelArray[2];
pdst -=2;
@@ -302,7 +303,8 @@ cfbFillBoxSolid (pDrawable, nBox, pBox, pixel)
break;
case 2:
while(h--){
- *pdst++ = ((*pdst) & 0xFFFF) | (piQxelArray[1] & 0xFFFF0000);
+ *pdst = ((*pdst) & 0xFFFF) | (piQxelArray[1] & 0xFFFF0000);
+ pdst++;
*pdst-- = piQxelArray[2];
pdst += widthDst;
}
@@ -321,24 +323,29 @@ cfbFillBoxSolid (pDrawable, nBox, pBox, pixel)
while(h--){
*pdst++ = piQxelArray[0];
*pdst++ = piQxelArray[1];
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelArray[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelArray[2] & 0xFF);
+ pdst--;
pdst--;
pdst += widthDst;
}
break;
case 1:
while(h--){
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ pdst++;
*pdst++ = piQxelArray[1];
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelArray[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelArray[2] & 0xFF);
+ pdst--;
pdst--;
pdst += widthDst;
}
break;
case 2:
while(h--){
- *pdst++ = ((*pdst) & 0xFFFF) | (piQxelArray[1] & 0xFFFF0000);
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelArray[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFF) | (piQxelArray[1] & 0xFFFF0000);
+ pdst++;
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelArray[2] & 0xFF);
+ pdst--;
pdst += widthDst;
}
break;
@@ -347,12 +354,14 @@ cfbFillBoxSolid (pDrawable, nBox, pBox, pixel)
case 2:
while(h--){
if(leftIndex){
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ pdst++;
}
else{
*pdst++ = piQxelArray[0];
}
- *pdst-- = ((*pdst) & 0xFFFF0000) | (piQxelArray[1] & 0xFFFF);
+ *pdst = ((*pdst) & 0xFFFF0000) | (piQxelArray[1] & 0xFFFF);
+ pdst--;
pdst += widthDst;
}
break;
@@ -376,16 +385,19 @@ cfbFillBoxSolid (pDrawable, nBox, pBox, pixel)
case 0:
break;
case 1:
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ pdst++;
*pdst++ = piQxelArray[1];
*pdst++ = piQxelArray[2];
break;
case 2:
- *pdst++ = ((*pdst) & 0xFFFF) | (piQxelArray[1] & 0xFFFF0000);
+ *pdst = ((*pdst) & 0xFFFF) | (piQxelArray[1] & 0xFFFF0000);
+ pdst++;
*pdst++ = piQxelArray[2];
break;
case 3:
- *pdst++ = ((*pdst) & 0xFF) | (piQxelArray[2] & 0xFFFFFF00);
+ *pdst = ((*pdst) & 0xFF) | (piQxelArray[2] & 0xFFFFFF00);
+ pdst++;
break;
}
while(nmiddle--){
@@ -544,7 +556,8 @@ cfbFillBoxTile32 (pDrawable, nBox, pBox, tile)
case 1:
while(h--){
StepTile
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ pdst++;
*pdst++ = piQxelArray[1];
*pdst = piQxelArray[2];
pdst-=2;
@@ -554,7 +567,8 @@ cfbFillBoxTile32 (pDrawable, nBox, pBox, tile)
case 2:
while(h--){
StepTile
- *pdst++ = ((*pdst) & 0xFFFF) | (piQxelArray[1] & 0xFFFF0000);
+ *pdst = ((*pdst) & 0xFFFF) | (piQxelArray[1] & 0xFFFF0000);
+ pdst++;
*pdst-- = piQxelArray[2];
pdst += widthDst;
}
@@ -575,7 +589,8 @@ cfbFillBoxTile32 (pDrawable, nBox, pBox, tile)
StepTile
*pdst++ = piQxelArray[0];
*pdst++ = piQxelArray[1];
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelArray[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelArray[2] & 0xFF);
+ pdst--;
pdst--;
pdst += widthDst;
}
@@ -583,9 +598,11 @@ cfbFillBoxTile32 (pDrawable, nBox, pBox, tile)
case 1:
while(h--){
StepTile
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ pdst++;
*pdst++ = piQxelArray[1];
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelArray[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelArray[2] & 0xFF);
+ pdst--;
pdst--;
pdst += widthDst;
}
@@ -593,8 +610,10 @@ cfbFillBoxTile32 (pDrawable, nBox, pBox, tile)
case 2:
while(h--){
StepTile
- *pdst++ = ((*pdst) & 0xFFFF) | (piQxelArray[1] & 0xFFFF0000);
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelArray[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFF) | (piQxelArray[1] & 0xFFFF0000);
+ pdst++;
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelArray[2] & 0xFF);
+ pdst--;
pdst += widthDst;
}
break;
@@ -604,12 +623,14 @@ cfbFillBoxTile32 (pDrawable, nBox, pBox, tile)
while(h--){
StepTile
if(leftIndex){
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ pdst++;
}
else{
*pdst++ = piQxelArray[0];
}
- *pdst-- = ((*pdst) & 0xFFFF0000) | (piQxelArray[1] & 0xFFFF);
+ *pdst = ((*pdst) & 0xFFFF0000) | (piQxelArray[1] & 0xFFFF);
+ pdst--;
pdst += widthDst;
}
break;
@@ -635,16 +656,19 @@ cfbFillBoxTile32 (pDrawable, nBox, pBox, tile)
case 0:
break;
case 1:
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelArray[0] & 0xFF000000);
+ pdst++;
*pdst++ = piQxelArray[1];
*pdst++ = piQxelArray[2];
break;
case 2:
- *pdst++ = ((*pdst) & 0xFFFF) | (piQxelArray[1] & 0xFFFF0000);
+ *pdst = ((*pdst) & 0xFFFF) | (piQxelArray[1] & 0xFFFF0000);
+ pdst++;
*pdst++ = piQxelArray[2];
break;
case 3:
- *pdst++ = ((*pdst) & 0xFF) | (piQxelArray[2] & 0xFFFFFF00);
+ *pdst = ((*pdst) & 0xFF) | (piQxelArray[2] & 0xFFFFFF00);
+ pdst++;
break;
}
while(nmiddle--){
diff --git a/xc/programs/Xserver/cfb/cfbsolid.c b/xc/programs/Xserver/cfb/cfbsolid.c
index 756fb0295..6d8a95692 100644
--- a/xc/programs/Xserver/cfb/cfbsolid.c
+++ b/xc/programs/Xserver/cfb/cfbsolid.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.7 2001/12/14 19:59:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.8 2002/09/16 18:05:31 eich Exp $ */
#include "X.h"
@@ -210,7 +210,8 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
case 1:
while(h--){
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ pdst++;
*pdst++ = piQxelXor[1];
*pdst-- = piQxelXor[2];
#endif
@@ -244,7 +245,8 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
case 2:
while(h--){
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ *pdst = ((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ pdst++;
*pdst-- = piQxelXor[2];
#endif
#if RROP == GXxor
@@ -297,7 +299,8 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
#if RROP == GXcopy
*pdst++ = piQxelXor[0];
*pdst++ = piQxelXor[1];
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ pdst--;
#endif
#if RROP == GXxor
*pdst++ ^= piQxelXor[0];
@@ -329,9 +332,11 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
case 1:
while(h--){
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ pdst++;
*pdst++ = piQxelXor[1];
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ pdst--;
#endif
#if RROP == GXxor
*pdst++ ^= (piQxelXor[0] & 0xFF000000);
@@ -363,8 +368,10 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
case 2:
while(h--){
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ pdst++;
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ pdst--;
#endif
#if RROP == GXxor
*pdst++ ^= (piQxelXor[1] & 0xFFFF0000);
@@ -414,8 +421,10 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
case 2:
while(h--){
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ pdst++;
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ pdst--;
#endif
#if RROP == GXxor
*pdst++ ^= (piQxelXor[1] & 0xFFFF0000);
@@ -441,8 +450,10 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
case 1:
while(h--){
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
- *pdst-- = ((*pdst) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ pdst++;
+ *pdst = ((*pdst) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
+ pdst--;
#endif
#if RROP == GXxor
*pdst++ ^= (piQxelXor[0] & 0xFF000000);
@@ -469,7 +480,8 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
while(h--){
#if RROP == GXcopy
*pdst++ = piQxelXor[0];
- *pdst-- = ((*pdst) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
+ *pdst = ((*pdst) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
+ pdst--;
#endif
#if RROP == GXxor
*pdst++ ^= piQxelXor[0];
@@ -525,7 +537,8 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
break;
case 1:
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ pdst++;
*pdst++ = piQxelXor[1];
*pdst++ = piQxelXor[2];
#endif
@@ -555,7 +568,8 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
break;
case 2:
#if RROP == GXcopy
- *pdst++ = (((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000));
+ *pdst = (((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000));
+ pdst++;
*pdst++ = piQxelXor[2];
#endif
#if RROP == GXxor
@@ -579,7 +593,8 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
break;
case 3:
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFF) | (piQxelXor[2] & 0xFFFFFF00);
+ *pdst = ((*pdst) & 0xFF) | (piQxelXor[2] & 0xFFFFFF00);
+ pdst++;
#endif
#if RROP == GXxor
*pdst++ ^= (piQxelXor[2] & 0xFFFFFF00);
@@ -632,7 +647,8 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
break;
case 1:
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFF000000) | (piQxelXor[0] & 0xFFFFFF);
+ *pdst = ((*pdst) & 0xFF000000) | (piQxelXor[0] & 0xFFFFFF);
+ pdst++;
#endif
#if RROP == GXxor
*pdst++ ^= (piQxelXor[0] & 0xFFFFFF);
@@ -644,13 +660,15 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
*pdst++ |= (piQxelOr[0] & 0xFFFFFF);
#endif
#if RROP == GXset
- *pdst++ = DoMaskRRop((*pdst), piQxelAnd[0], piQxelXor[0], 0xFFFFFF);
+ *pdst = DoMaskRRop((*pdst), piQxelAnd[0], piQxelXor[0], 0xFFFFFF);
+ pdst++;
#endif
break;
case 2:
#if RROP == GXcopy
*pdst++ = piQxelXor[0];
- *pdst++ = ((*pdst) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
+ *pdst = ((*pdst) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
+ pdst++;
#endif
#if RROP == GXxor
*pdst++ ^= piQxelXor[0];
@@ -675,7 +693,8 @@ RROP_NAME(cfbFillRectSolid) (pDrawable, pGC, nBox, pBox)
#if RROP == GXcopy
*pdst++ = piQxelXor[0];
*pdst++ = piQxelXor[1];
- *pdst++ = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ pdst++;
#endif
#if RROP == GXxor
*pdst++ ^= piQxelXor[0];
@@ -864,7 +883,8 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
break;
case 1:
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ pdst++;
*pdst++ = piQxelXor[1];
*pdst-- = piQxelXor[2];
#endif
@@ -895,7 +915,8 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
break;
case 2:
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ *pdst = ((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ pdst++;
*pdst-- = piQxelXor[2];
#endif
#if RROP == GXxor
@@ -942,7 +963,8 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
#if RROP == GXcopy
*pdst++ = piQxelXor[0];
*pdst++ = piQxelXor[1];
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ pdst--;
#endif
#if RROP == GXxor
*pdst++ ^= piQxelXor[0];
@@ -972,9 +994,11 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
break;
case 1:
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ pdst++;
*pdst++ = piQxelXor[1];
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ pdst--;
#endif
#if RROP == GXxor
*pdst++ ^= (piQxelXor[0] & 0xFF000000);
@@ -1004,8 +1028,10 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
case 2:
/* pdst++;*/
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
- *pdst-- = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000);
+ pdst++;
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ pdst--;
#endif
#if RROP == GXxor
*pdst++ ^= (piQxelXor[1] & 0xFFFF0000);
@@ -1031,8 +1057,10 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
case 2: /* leftIndex + w = 2*/
if(leftIndex){
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
- *pdst-- = ((*pdst) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ pdst++;
+ *pdst = ((*pdst) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
+ pdst--;
#endif
#if RROP == GXxor
*pdst++ ^= (piQxelXor[0] & 0xFF000000);
@@ -1056,7 +1084,8 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
else{ /*case 2 leftIndex === 0 */
#if RROP == GXcopy
*pdst++ = piQxelXor[0];
- *pdst-- = ((*pdst) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
+ *pdst = ((*pdst) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
+ pdst--;
#endif
#if RROP == GXxor
*pdst++ ^= piQxelXor[0];
@@ -1104,7 +1133,8 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
break;
case 1:
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ *pdst = ((*pdst) & 0xFFFFFF) | (piQxelXor[0] & 0xFF000000);
+ pdst++;
*pdst++ = piQxelXor[1];
*pdst++ = piQxelXor[2];
#endif
@@ -1134,7 +1164,8 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
break;
case 2:
#if RROP == GXcopy
- *pdst++ = (((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000));
+ *pdst = (((*pdst) & 0xFFFF) | (piQxelXor[1] & 0xFFFF0000));
+ pdst++;
*pdst++ = piQxelXor[2];
#endif
#if RROP == GXxor
@@ -1158,7 +1189,8 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
break;
case 3:
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFF) | (piQxelXor[2] & 0xFFFFFF00);
+ *pdst = ((*pdst) & 0xFF) | (piQxelXor[2] & 0xFFFFFF00);
+ pdst++;
#endif
#if RROP == GXxor
*pdst++ ^= (piQxelXor[2] & 0xFFFFFF00);
@@ -1210,7 +1242,8 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
break;
case 1:
#if RROP == GXcopy
- *pdst++ = ((*pdst) & 0xFF000000) | (piQxelXor[0] & 0xFFFFFF);
+ *pdst = ((*pdst) & 0xFF000000) | (piQxelXor[0] & 0xFFFFFF);
+ pdst++;
#endif
#if RROP == GXxor
*pdst++ ^= (piQxelXor[0] & 0xFFFFFF);
@@ -1228,7 +1261,8 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
case 2:
#if RROP == GXcopy
*pdst++ = piQxelXor[0];
- *pdst++ = ((*pdst) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
+ *pdst = ((*pdst) & 0xFFFF0000) | (piQxelXor[1] & 0xFFFF);
+ pdst++;
#endif
#if RROP == GXxor
*pdst++ ^= piQxelXor[0];
@@ -1253,7 +1287,8 @@ RROP_NAME(cfbSolidSpans) (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
#if RROP == GXcopy
*pdst++ = piQxelXor[0];
*pdst++ = piQxelXor[1];
- *pdst++ = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ *pdst = ((*pdst) & 0xFFFFFF00) | (piQxelXor[2] & 0xFF);
+ pdst++;
#endif
#if RROP == GXxor
*pdst++ ^= piQxelXor[0];
diff --git a/xc/programs/Xserver/cfb/module/Imakefile b/xc/programs/Xserver/cfb/module/Imakefile
new file mode 100644
index 000000000..79dda8413
--- /dev/null
+++ b/xc/programs/Xserver/cfb/module/Imakefile
@@ -0,0 +1,8 @@
+XCOMM $XFree86: xc/programs/Xserver/cfb/module/Imakefile,v 1.1 2002/05/31 15:12:56 dawes Exp $
+
+#define IHaveModules
+
+#define PixelSize 8
+#define LinkDirectory ..
+
+#include "../Imakefile.inc"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 16:28:06 +0000