Module Name: xsrc
Committed By: macallan
Date: Wed Oct 26 14:29:48 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb_driver.c
Log Message:
default to exa if we don't have xaa
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_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-sunffb/dist/src/ffb_driver.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.10 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.11
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.10 Wed Sep 7 17:10:18 2016
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c Wed Oct 26 14:29:48 2016
@@ -755,20 +755,27 @@ FFBScreenInit(SCREEN_INIT_ARGS_DECL)
if (!pFfb->NoAccel) {
char *optstr;
optstr = (char *)xf86GetOptValString(pFfb->Options, OPTION_ACCELMETHOD);
+#ifdef HAVE_XAA_H
if (optstr == NULL) optstr = "xaa";
+#else
+ if (optstr == NULL) optstr = "exa";
+#endif
if (xf86NameCmp(optstr, "EXA") == 0) {
xf86Msg(X_INFO, "using EXA\n");
if (xf86LoadSubModule(pScrn, "exa") != NULL) {
if (!FFBInitEXA(pScreen))
return FALSE;
}
- } else if (xf86NameCmp(optstr, "XAA") == 0) {
+ }
+#ifdef HAVE_XAA_H
+ else if (xf86NameCmp(optstr, "XAA") == 0) {
xf86Msg(X_INFO, "using XAA\n");
if (xf86LoadSubModule(pScrn, "xaa") != NULL) {
if (!FFBAccelInit(pScreen, pFfb))
return FALSE;
}
}
+#endif
}
