summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/atidri.c4
-rw-r--r--src/atimach64exa.c3
2 files changed, 1 insertions, 6 deletions
diff --git a/src/atidri.c b/src/atidri.c
index 26bee388..2bc6d841 100644
--- a/src/atidri.c
+++ b/src/atidri.c
@@ -408,7 +408,6 @@ static void ATIDRITransitionTo2d_EXA(ScreenPtr pScreen)
{
ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
ATIPtr pATI = ATIPTR(pScreenInfo);
-#if 0
ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo;
exaEnableDisableFBAccess(pScreen->myNum, FALSE);
@@ -416,7 +415,6 @@ static void ATIDRITransitionTo2d_EXA(ScreenPtr pScreen)
pATI->pExa->offScreenBase = pATIDRIServer->backOffset;
exaEnableDisableFBAccess(pScreen->myNum, TRUE);
-#endif
pATI->have3DWindows = FALSE;
}
@@ -425,7 +423,6 @@ static void ATIDRITransitionTo3d_EXA(ScreenPtr pScreen)
{
ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
ATIPtr pATI = ATIPTR(pScreenInfo);
-#if 0
ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo;
exaEnableDisableFBAccess(pScreen->myNum, FALSE);
@@ -434,7 +431,6 @@ static void ATIDRITransitionTo3d_EXA(ScreenPtr pScreen)
pATIDRIServer->textureSize;
exaEnableDisableFBAccess(pScreen->myNum, TRUE);
-#endif
pATI->have3DWindows = TRUE;
}
diff --git a/src/atimach64exa.c b/src/atimach64exa.c
index e2b25405..a2f1afec 100644
--- a/src/atimach64exa.c
+++ b/src/atimach64exa.c
@@ -570,8 +570,7 @@ Mach64SetupMemEXA(ScreenPtr pScreen)
pATIDRIServer->textureSize = textureSize;
next += textureSize;
- if (pATI->directRenderingEnabled)
- pExa->offScreenBase = next;
+ /* pExa->offScreenBase is moved to `next' when DRI gets activated */
}
#endif /* XF86DRI_DEVEL */