Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/specs/libX11/CH11.xml
	mesalib/src/glsl/main.cpp
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/get.c
	mesalib/src/mesa/main/texcompress.c
	mesalib/src/mesa/main/texparam.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_optimize.c
	pixman/pixman/pixman-fast-path.c
	pixman/pixman/pixman-fast-path.h
	xorg-server/hw/xquartz/GL/indirect.c
	xorg-server/hw/xquartz/X11Application.h
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist
	xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib
	xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist
	xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib
	xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist
	xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib
	xorg-server/hw/xquartz/darwinEvents.c
	xorg-server/hw/xquartz/darwinEvents.h
	xorg-server/hw/xquartz/man/Xquartz.man
	xorg-server/hw/xquartz/xpr/dri.c
	xorg-server/xkeyboard-config/symbols/ee

1 files changed, 50 insertions, 11 deletions

diff --git a/xorg-server/hw/xquartz/xpr/dri.c b/xorg-server/hw/xquartz/xpr/dri.c
index cdfe13622..63fcabe38 100644
--- a/xorg-server/hw/xquartz/xpr/dri.c
+++ b/xorg-server/hw/xquartz/xpr/dri.c
@@ -395,8 +395,8 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
 	    return FALSE; /*error*/

     }

 #endif

-    else { /* for GLX 1.3, a PBuffer */

-        /* NOT_DONE */

+    else {

+	/* We handle GLXPbuffers in a different way (via CGL). */

         return FALSE;

     }

     

@@ -486,13 +486,27 @@ DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
     }

 

     if (pDRIDrawablePriv != NULL) {

+	/*

+	 * This doesn't seem to be used, because notify is NULL in all callers.

+	 */

+

         if (notify != NULL) {

             pDRIDrawablePriv->notifiers = x_hook_remove(pDRIDrawablePriv->notifiers,

                                                         notify, notify_data);

         }

-        if (--pDRIDrawablePriv->refCount <= 0) {

-            /* This calls back to DRIDrawablePrivDelete

-               which frees the private area */

+

+	--pDRIDrawablePriv->refCount;

+

+	/* 

+	 * Check if the drawable privates still have a reference to the

+	 * surface.

+	 */

+

+        if (pDRIDrawablePriv->refCount <= 0) {

+            /*

+	     * This calls back to DRIDrawablePrivDelete which

+	     * frees the private area and dispatches events, if needed. 

+	     */

             FreeResourceByType(id, DRIDrawablePrivResType, FALSE);

         }

     }

@@ -500,6 +514,10 @@ DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
     return TRUE;

 }

 

+/* 

+ * The assumption is that this is called when the refCount of a surface

+ * drops to <= 0, or the window/pixmap is destroyed.  

+ */

 Bool

 DRIDrawablePrivDelete(pointer pResource, XID id)

 {

@@ -518,18 +536,23 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
     }

 

     if (pDRIDrawablePriv == NULL) {

+	/* 

+	 * We reuse __func__ and the resource type for the GLXPixmap code.

+	 * Attempt to free a pixmap buffer associated with the resource

+	 * if possible.

+	 */

 	return DRIFreePixmapImp(pDrawable);

     }

-

+    

     if (pDRIDrawablePriv->drawableIndex != -1) {

         /* release drawable table entry */

         pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL;

     }

 

     if (pDRIDrawablePriv->sid != 0) {

-        xp_destroy_surface(pDRIDrawablePriv->sid);

-        x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(pDRIDrawablePriv->sid));

+	DRISurfaceNotify(pDRIDrawablePriv->sid, AppleDRISurfaceNotifyDestroyed);

     }

+  

 

     if (pDRIDrawablePriv->notifiers != NULL)

         x_hook_free(pDRIDrawablePriv->notifiers);

@@ -673,6 +696,11 @@ DRIQueryVersion(int *majorVersion,
     *patchVersion = APPLE_DRI_PATCH_VERSION;

 }

 

+/* 

+ * Note: this also cleans up the hash table in addition to notifying clients.

+ * The sid/surface-id should not be used after this, because it will be

+ * invalid.

+ */ 

 void

 DRISurfaceNotify(xp_surface_id id, int kind)

 {

@@ -693,21 +721,32 @@ DRISurfaceNotify(xp_surface_id id, int kind)
 

     if (kind == AppleDRISurfaceNotifyDestroyed)

     {

-        pDRIDrawablePriv->sid = 0;

-        x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(id));

+	x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(id));

     }

 

     x_hook_run(pDRIDrawablePriv->notifiers, &arg);

 

     if (kind == AppleDRISurfaceNotifyDestroyed)

     {

-        /* Kill off the handle. */

+	xp_error error;

+	

+	error = xp_destroy_surface(pDRIDrawablePriv->sid);

+	

+	if(error) 

+	    ErrorF("%s: xp_destroy_surface failed: %d\n", __func__, error);

+		

+	/* Guard against reuse, even though we are freeing after this. */

+	pDRIDrawablePriv->sid = 0;

 

         FreeResourceByType(pDRIDrawablePriv->pDraw->id,

                            DRIDrawablePrivResType, FALSE);

     }

 }

 

+/*

+ * This creates a shared memory buffer for use with GLXPixmaps

+ * and AppleSGLX.

+ */

 Bool DRICreatePixmap(ScreenPtr pScreen, Drawable id,

 		     DrawablePtr pDrawable, char *path,

 		     size_t pathmax)