This reverts commit 541b25038a5de74411a094570b407c5ae018c2ba.

- It turns out that the high latency was a driver problem.
- catting a large amount of text turns out to look prettier when the
  throughput is lower, but it's not worth the loss for a minor
  improvement that may not even exist on someone else's computer.

Signed-off-by: Maarten Maathuis <[email protected]>
---
 exa/exa_migration_mixed.c |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c
index 4f49905..fb47151 100644
--- a/exa/exa_migration_mixed.c
+++ b/exa/exa_migration_mixed.c
@@ -138,7 +138,6 @@ void
 exaDamageReport_mixed(DamagePtr pDamage, RegionPtr pRegion, void *closure)
 {
     PixmapPtr pPixmap = closure;
-    ScreenPtr pScreen = pPixmap->drawable.pScreen;
     ExaPixmapPriv(pPixmap);
 
     /* Move back results of software rendering on system memory copy of mixed 
driver
@@ -150,18 +149,10 @@ exaDamageReport_mixed(DamagePtr pDamage, RegionPtr 
pRegion, void *closure)
     if (!pExaPixmap->use_gpu_copy && exaPixmapHasGpuCopy(pPixmap)) {
        ExaScreenPriv(pPixmap->drawable.pScreen);
 
-       /* Front buffer: Don't wait for the block handler to copy back the data.
-        * This avoids annoying latency if you encounter a lot of software 
rendering.
-        */
-       if (pPixmap == pScreen->GetScreenPixmap(pScreen))
-               exaMoveInPixmap_mixed(pPixmap);
-       else {
-               if (pExaScr->deferred_mixed_pixmap &&
-                   pExaScr->deferred_mixed_pixmap != pPixmap)
-                   exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap);
-
-               pExaScr->deferred_mixed_pixmap = pPixmap;
-       }
+       if (pExaScr->deferred_mixed_pixmap &&
+           pExaScr->deferred_mixed_pixmap != pPixmap)
+           exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap);
+       pExaScr->deferred_mixed_pixmap = pPixmap;
     }
 }
 
-- 
1.7.4.1

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to