xf86-video-ati: Branch 'master' - 2 commits

[George Sapountzis]

 configure.ac       |    6 +++---
 src/atidri.c       |    4 ----
 src/atimach64exa.c |    3 +--
 3 files changed, 4 insertions(+), 9 deletions(-)

New commits:
diff-tree ca8c148942371c9445f32985625ce38eabc016e1 (from 23cec754158c94b43225b2070fc0a0b003e7bd25)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date:   Thu Oct 26 15:40:46 2006 +0300

    Handle .99 in version patch level.

diff --git a/configure.ac b/configure.ac
index 4599429..ca69b0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,13 +26,13 @@ AC_INIT([xf86-video-ati],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-ati)
 AC_DEFINE_UNQUOTED([ATI_VERSION_MAJOR],
-		   [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]\)\.[[0-9]]\.[[0-9]]/\1/')],
+		   [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]\)\.[[0-9]]\.[[0-9]\+]/\1/')],
 		   [Major version])
 AC_DEFINE_UNQUOTED([ATI_VERSION_MINOR],
-		   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.\([[0-9]]\)\.[[0-9]]/\1/')],
+		   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.\([[0-9]]\)\.[[0-9]\+]/\1/')],
 		   [Minor version])
 AC_DEFINE_UNQUOTED([ATI_VERSION_PATCH],
-		   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.[[0-9]]\.\([[0-9]]\)/\1/')],
+		   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.[[0-9]]\.\([[0-9]\+]\)/\1/')],
 		   [Patch version])
 
 AC_CONFIG_SRCDIR([Makefile.am])
diff-tree 23cec754158c94b43225b2070fc0a0b003e7bd25 (from 9cd78af1d06f753e7bd7e1acaff25398bde45f6e)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date:   Thu Oct 26 15:39:49 2006 +0300

    [mach64] EXA: reserve DRI buffers only when DRI is active.

diff --git a/src/atidri.c b/src/atidri.c
index 26bee38..2bc6d84 100644
--- a/src/atidri.c
+++ b/src/atidri.c
@@ -408,7 +408,6 @@ static void ATIDRITransitionTo2d_EXA(Scr
 {
    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(Scr
    pATI->pExa->offScreenBase = pATIDRIServer->backOffset;
 
    exaEnableDisableFBAccess(pScreen->myNum, TRUE);
-#endif
 
    pATI->have3DWindows = FALSE;
 }
@@ -425,7 +423,6 @@ static void ATIDRITransitionTo3d_EXA(Scr
 {
    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(Scr
 			       pATIDRIServer->textureSize;
 
    exaEnableDisableFBAccess(pScreen->myNum, TRUE);
-#endif
 
    pATI->have3DWindows = TRUE;
 }
diff --git a/src/atimach64exa.c b/src/atimach64exa.c
index e2b2540..a2f1afe 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 */