Module Name: xsrc
Committed By: macallan
Date: Fri Nov 27 13:41:20 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-suncg6/dist/src: cg6.h cg6_accel.c
cg6_driver.c
Log Message:
make this compile without XAA
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h \
xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_accel.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h
diff -u xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h:1.4 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h:1.5
--- xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h:1.4 Wed Nov 25 18:01:29 2015
+++ xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h Fri Nov 27 13:41:20 2015
@@ -31,7 +31,9 @@
#include "gcstruct.h"
#include "cg6_regs.h"
#include "xf86sbusBus.h"
+#ifdef HAVE_XAA_H
#include "xaa.h"
+#endif
#include "exa.h"
/* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
@@ -77,11 +79,13 @@ typedef struct {
Bool CursorEnabled;
OptionInfoPtr Options;
+#ifdef HAVE_XAA_H
unsigned char *buffers[1];
CARD32 scanline[1024];
int words_in_scanline, scan_x, scan_y, scan_xe;
- int clipxa, clipxe;
XAAInfoRecPtr pXAA;
+#endif
+ int clipxa, clipxe;
ExaDriverPtr pExa;
int srcoff, fg;
} Cg6Rec, *Cg6Ptr;
Index: xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_accel.c
diff -u xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_accel.c:1.4 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_accel.c:1.5
--- xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_accel.c:1.4 Wed Nov 25 18:01:29 2015
+++ xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_accel.c Fri Nov 27 13:41:20 2015
@@ -305,6 +305,8 @@ Cg6SubsequentSolidFillRect
runDraw(pCg6);
}
+#ifdef HAVE_XAA_H
+
static void
Cg6SetupForCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
int fg, int bg,
@@ -496,6 +498,8 @@ CG6AccelInit(ScrnInfoPtr pScrn)
return 0;
}
+#endif /* HAVE_XAA_H */
+
Bool
Cg6DGAInit(ScreenPtr pScreen)
{
Index: xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c
diff -u xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c:1.9 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c:1.10
--- xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c:1.9 Wed Nov 25 18:01:29 2015
+++ xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c Fri Nov 27 13:41:20 2015
@@ -566,6 +566,7 @@ CG6ScreenInit(SCREEN_INIT_ARGS_DECL)
xf86SetBlackWhitePixels(pScreen);
if (!pCg6->NoAccel) {
+#ifdef HAVE_XAA_H
if (pCg6->useXAA) {
BoxRec bx;
if (!xf86LoadSubModule(pScrn, "xaa"))
@@ -580,7 +581,9 @@ CG6ScreenInit(SCREEN_INIT_ARGS_DECL)
return FALSE;
xf86Msg(X_INFO, "%s: Using XAA acceleration\n", pCg6->psdp->device);
- } else {
+ } else
+#endif /* HAVE_XAA_H */
+ {
/* EXA */
XF86ModReqInfo req;
int errmaj, errmin;
