xserver: Branch 'master' - 3 commits

[Keith Packard]

 hw/xquartz/GL/visualConfigs.c   |    2 --
 miext/rootless/rootlessWindow.c |    6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 6a9bd103cb993e873cb82664b677ceed73c0bd85
Merge: ea3b7db 8aae28e
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Oct 7 17:29:38 2013 -0700

    Merge remote-tracking branch 'jeremyhu/master'

commit 8aae28e3cbdd49bfa8d940a4a517c94a53b94f86
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Oct 6 09:20:45 2013 -0700

    XQuartz: Dont't set screen on __GLXConfig
    
    Fixes regression introduced by c3c976f54c3c282d6fa6c8360688e036bc43d210
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c
index 92142cb..687bf80 100644
--- a/hw/xquartz/GL/visualConfigs.c
+++ b/hw/xquartz/GL/visualConfigs.c
@@ -140,8 +140,6 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
                                         c->visualType = GLX_TRUE_COLOR;
                                         c->next = c + 1;
 
-                                        c->screen = screenNumber;
-
                                         c->level = 0;
                                         c->indexBits = 0;
 
commit c5f8eb968efa970201712105a1ac880b517e7b6d
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Oct 6 09:18:15 2013 -0700

    rootless: Use miCopyRegion instead of fbCopyRegion
    
    Fixes regression introduced by e657635dbe6b92875b0e88370557c2cbab673a49
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index cfcb6e5..7e3c281 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -684,7 +684,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
     if (gResizeDeathCount == 1) {
         /* Simple case, we only have a single source pixmap. */
 
-        fbCopyRegion(&gResizeDeathPix[0]->drawable,
+        miCopyRegion(&gResizeDeathPix[0]->drawable,
                      &pScreen->GetWindowPixmap(pWin)->drawable, 0,
                      &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);
     }
@@ -700,7 +700,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
             RegionNull(&clipped);
             RegionIntersect(&rgnDst, &clip, &clipped);
 
-            fbCopyRegion(&gResizeDeathPix[i]->drawable,
+            miCopyRegion(&gResizeDeathPix[i]->drawable,
                          &pScreen->GetWindowPixmap(pWin)->drawable, 0,
                          &clipped, dx, dy, fbCopyWindowProc, 0, 0);
 
@@ -778,7 +778,7 @@ RootlessCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     else {
         RootlessStartDrawing(pWin);
 
-        fbCopyRegion((DrawablePtr) pWin, (DrawablePtr) pWin,
+        miCopyRegion((DrawablePtr) pWin, (DrawablePtr) pWin,
                      0, &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);
 
         /* prgnSrc has been translated to dst position */