From 3815190d52f8ae453c2458335394eb5b18ab9bf5 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 14 Sep 2010 13:17:20 +0000
Subject: xserver libX11 pixman git update 14/9/2010

---
 xorg-server/hw/xquartz/xpr/driWrap.c   | 6 +-----
 xorg-server/hw/xquartz/xpr/xprFrame.c  | 4 ----
 xorg-server/hw/xquartz/xpr/xprScreen.c | 6 ------
 3 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'xorg-server/hw/xquartz')

diff --git a/xorg-server/hw/xquartz/xpr/driWrap.c b/xorg-server/hw/xquartz/xpr/driWrap.c
index 37cb8cf5a..c38761555 100644
--- a/xorg-server/hw/xquartz/xpr/driWrap.c
+++ b/xorg-server/hw/xquartz/xpr/driWrap.c
@@ -41,7 +41,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 typedef struct {
     GCOps *originalOps;
-    GCOps *driOps;
 } DRIGCRec;
 
 typedef struct {
@@ -86,9 +85,7 @@ DRIUnwrapGC(GCPtr pGC) {
 
 static void 
 DRIWrapGC(GCPtr pGC) {
-    DRIGCRec *pGCPriv = DRIGetGCPriv(pGC);
-    
-    pGC->ops = pGCPriv->driOps;
+    pGC->ops = &driGCOps;
 }
 
 static void
@@ -513,7 +510,6 @@ DRICreateGC(GCPtr pGC) {
     if(ret) {
 	pGCPriv->originalOps = pGC->ops;
 	pGC->ops = &driGCOps;
-	pGCPriv->driOps = &driGCOps;
     }
 
     wrap(pScreenPriv, pScreen, CreateGC, DRICreateGC);
diff --git a/xorg-server/hw/xquartz/xpr/xprFrame.c b/xorg-server/hw/xquartz/xpr/xprFrame.c
index 5a40cbf41..121f1de3d 100644
--- a/xorg-server/hw/xquartz/xpr/xprFrame.c
+++ b/xorg-server/hw/xquartz/xpr/xprFrame.c
@@ -463,8 +463,6 @@ static RootlessFrameProcsRec xprRootlessProcs = {
     xprHideWindow,
     xprUpdateColormap,
     xp_copy_bytes,
-    xp_fill_bytes,
-    xp_composite_pixels,
     xprCopyWindow
 };
 
@@ -480,8 +478,6 @@ xprInit(ScreenPtr pScreen)
     TA_SERVER();
     
     rootless_CopyBytes_threshold = xp_copy_bytes_threshold;
-    rootless_FillBytes_threshold = xp_fill_bytes_threshold;
-    rootless_CompositePixels_threshold = xp_composite_area_threshold;
     rootless_CopyWindow_threshold = xp_scroll_area_threshold;
 
     return TRUE;
diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index d4fef8e0a..260bfee89 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -367,12 +367,6 @@ xprAddScreen(int index, ScreenPtr pScreen)
 static Bool
 xprSetupScreen(int index, ScreenPtr pScreen)
 {
-    // Initialize accelerated rootless drawing
-    // Note that this must be done before DamageSetup().
-
-    // These are crashing ugly... better to be stable and not crash for now.
-    //RootlessAccelInit(pScreen);
-
 #ifdef DAMAGE
     // The Damage extension needs to wrap underneath the
     // generic rootless layer, so do it now.
-- 
cgit v1.2.3