rpms/xorg-x11-server/F-11 xserver-1.6.1-fix-glx-drawable.patch, NONE, 1.1 xorg-x11-server.spec, 1.449, 1.450

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32675

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.1-fix-glx-drawable.patch 
Log Message:
* Tue Jun 09 2009 Dave Airlie <airlied at redhat.com> 1.6.1.901-4
- backport a GLX drawable fixes


xserver-1.6.1-fix-glx-drawable.patch:

--- NEW FILE xserver-1.6.1-fix-glx-drawable.patch ---
>From 2075d4bf9e53b8baef0b919da6c44771220cd4a5 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Michel=20D=C3=A4nzer?= <daenzer at vmware.com>
Date: Thu, 14 May 2009 11:46:41 +0200
Subject: [PATCH] glx: If a destroyed window is bound to the current context, make it not current.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Avoids subsequent crashes due to stale pointers to the DrawableRec, see
https://bugs.freedesktop.org/show_bug.cgi?id=21132#c15 and previous comments.

Signed-off-by: Michel Dänzer <daenzer at vmware.com>
---
 glx/glxext.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/glx/glxext.c b/glx/glxext.c
index 93391e9..6bc7bef 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -126,6 +126,10 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
     __GLXcontext *c;
 
     for (c = glxAllContexts; c; c = c->next) {
+	if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
+	    (*c->loseCurrent)(c);
+	    __glXFlushContextCache();
+	}
 	if (c->drawPriv == glxPriv)
 	    c->drawPriv = NULL;
 	if (c->readPriv == glxPriv)
-- 
1.6.2.2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -p -r1.449 -r1.450
--- xorg-x11-server.spec	27 May 2009 05:41:41 -0000	1.449
+++ xorg-x11-server.spec	9 Jun 2009 05:54:14 -0000	1.450
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1.901
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -118,6 +118,8 @@ Patch6044: xserver-1.6.1-xkbsendmap.patc
 # #492359, monitor doesn't set first detailed timing preferred bit
 Patch6045: xserver-1.6.1-pea-quirk.patch
 
+Patch6046: xserver-1.6.1-fix-glx-drawable.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -534,6 +536,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 09 2009 Dave Airlie <airlied at redhat.com> 1.6.1.901-4
+- backport a GLX drawable fixes
+
 * Wed May 27 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.1.901-3
 - xserver-1.6.1-pea-quirk.patch: edid quirk for PEA prod 9003 (rh#492359)