xf86-video-r128: Branch 'master'
Dave Airlie
airlied at kemper.freedesktop.org
Sun Jul 29 21:28:55 PDT 2012
src/r128_accel.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit deb05ac9cf58608b3d8d9947f52e9bcc5e0ae6b5
Author: Connor Behan <connor.behan at gmail.com>
Date: Mon Jul 30 14:28:05 2012 +1000
Fix build without XAA again
referring to info->accel instead of info->accelOn
Signed-off-by: Connor Behan <connor.behan at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/src/r128_accel.c b/src/r128_accel.c
index 1df4eb8..1b8c023 100644
--- a/src/r128_accel.c
+++ b/src/r128_accel.c
@@ -1875,7 +1875,6 @@ Bool R128AccelInit(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
R128InfoPtr info = R128PTR(pScrn);
- XAAInfoRecPtr a;
#ifdef USE_EXA
if (info->useEXA) {
@@ -1895,15 +1894,18 @@ Bool R128AccelInit(ScreenPtr pScreen)
info->ExaDriver = exaDriverAlloc();
if (!info->ExaDriver) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Could not allocate EXA driver...\n");
- info->accel = FALSE;
+ info->accelOn = FALSE;
}
return TRUE;
}
#endif
+
#ifndef HAVE_XAA_H
return FALSE;
#else
+ XAAInfoRecPtr a;
+
if (!info->useEXA) {
if (!xf86LoadSubModule(pScrn, "xaa")) return FALSE;
}
More information about the xorg-commit
mailing list