Merge remote-tracking branch 'jeremyhu/master'
This commit is contained in:
commit
6a9bd103cb
|
@ -140,8 +140,6 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
|
||||||
c->visualType = GLX_TRUE_COLOR;
|
c->visualType = GLX_TRUE_COLOR;
|
||||||
c->next = c + 1;
|
c->next = c + 1;
|
||||||
|
|
||||||
c->screen = screenNumber;
|
|
||||||
|
|
||||||
c->level = 0;
|
c->level = 0;
|
||||||
c->indexBits = 0;
|
c->indexBits = 0;
|
||||||
|
|
||||||
|
|
|
@ -684,7 +684,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
|
||||||
if (gResizeDeathCount == 1) {
|
if (gResizeDeathCount == 1) {
|
||||||
/* Simple case, we only have a single source pixmap. */
|
/* Simple case, we only have a single source pixmap. */
|
||||||
|
|
||||||
fbCopyRegion(&gResizeDeathPix[0]->drawable,
|
miCopyRegion(&gResizeDeathPix[0]->drawable,
|
||||||
&pScreen->GetWindowPixmap(pWin)->drawable, 0,
|
&pScreen->GetWindowPixmap(pWin)->drawable, 0,
|
||||||
&rgnDst, dx, dy, fbCopyWindowProc, 0, 0);
|
&rgnDst, dx, dy, fbCopyWindowProc, 0, 0);
|
||||||
}
|
}
|
||||||
|
@ -700,7 +700,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
|
||||||
RegionNull(&clipped);
|
RegionNull(&clipped);
|
||||||
RegionIntersect(&rgnDst, &clip, &clipped);
|
RegionIntersect(&rgnDst, &clip, &clipped);
|
||||||
|
|
||||||
fbCopyRegion(&gResizeDeathPix[i]->drawable,
|
miCopyRegion(&gResizeDeathPix[i]->drawable,
|
||||||
&pScreen->GetWindowPixmap(pWin)->drawable, 0,
|
&pScreen->GetWindowPixmap(pWin)->drawable, 0,
|
||||||
&clipped, dx, dy, fbCopyWindowProc, 0, 0);
|
&clipped, dx, dy, fbCopyWindowProc, 0, 0);
|
||||||
|
|
||||||
|
@ -778,7 +778,7 @@ RootlessCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
|
||||||
else {
|
else {
|
||||||
RootlessStartDrawing(pWin);
|
RootlessStartDrawing(pWin);
|
||||||
|
|
||||||
fbCopyRegion((DrawablePtr) pWin, (DrawablePtr) pWin,
|
miCopyRegion((DrawablePtr) pWin, (DrawablePtr) pWin,
|
||||||
0, &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);
|
0, &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);
|
||||||
|
|
||||||
/* prgnSrc has been translated to dst position */
|
/* prgnSrc has been translated to dst position */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user