Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/link_functions.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/main.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	xorg-server/composite/compalloc.c
	xorg-server/configure.ac
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/bundle/Makefile.am
	xorg-server/hw/xquartz/xpr/xprFrame.c
	xorg-server/include/windowstr.h

1 files changed, 5 insertions, 7 deletions

diff --git a/xorg-server/composite/compalloc.c b/xorg-server/composite/compalloc.c
index a4414f70e..e64d1061b 100644
--- a/xorg-server/composite/compalloc.c
+++ b/xorg-server/composite/compalloc.c
@@ -434,6 +434,7 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
 	 * critical output

 	 */

 	DamageExtSetCritical (pClient, TRUE);

+	pWin->inhibitBGPaint = TRUE;

     }

     return Success;

 }

@@ -466,6 +467,7 @@ compFreeClientSubwindows (WindowPtr pWin, XID id)
 		 */

 		DamageExtSetCritical (pClient, FALSE);

 		csw->update = CompositeRedirectAutomatic;

+		pWin->inhibitBGPaint = FALSE;

 		if (pWin->mapped)

 		    (*pWin->drawable.pScreen->ClearToBackground)(pWin, 0, 0, 0, 0, TRUE);

 	    }

@@ -557,7 +559,7 @@ compUnredirectOneSubwindow (WindowPtr pParent, WindowPtr pWin)
 }

 

 static PixmapPtr

-compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)

+compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)

 {

     ScreenPtr	    pScreen = pWin->drawable.pScreen;

     WindowPtr	    pParent = pWin->parent;

@@ -572,10 +574,6 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)
     pPixmap->screen_x = x;

     pPixmap->screen_y = y;

 

-    /* resize allocations will update later in compCopyWindow, not here */

-    if (!map)

-	return pPixmap;

-

     if (pParent->drawable.depth == pWin->drawable.depth)

     {

 	GCPtr	pGC = GetScratchGC (pWin->drawable.depth, pScreen);

@@ -641,7 +639,7 @@ compAllocPixmap (WindowPtr pWin)
     int		    y = pWin->drawable.y - bw;

     int		    w = pWin->drawable.width + (bw << 1);

     int		    h = pWin->drawable.height + (bw << 1);

-    PixmapPtr	    pPixmap = compNewPixmap (pWin, x, y, w, h, TRUE);

+    PixmapPtr	    pPixmap = compNewPixmap (pWin, x, y, w, h);

     CompWindowPtr   cw = GetCompWindow (pWin);

 

     if (!pPixmap)

@@ -713,7 +711,7 @@ compReallocPixmap (WindowPtr pWin, int draw_x, int draw_y,
     pix_h = h + (bw << 1);

     if (pix_w != pOld->drawable.width || pix_h != pOld->drawable.height)

     {

-	pNew = compNewPixmap (pWin, pix_x, pix_y, pix_w, pix_h, FALSE);

+	pNew = compNewPixmap (pWin, pix_x, pix_y, pix_w, pix_h);

 	if (!pNew)

 	    return FALSE;

 	cw->pOldPixmap = pOld;