From 16887d042a917fa4773e4d853f50051b54e9948c Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Fri, 27 Aug 2010 12:40:11 -0400 Subject: glx: Drop broken drawable garbage collection Doesn't work for pixmaps, was looking up the GLX XID and was never thread safe. Instead, just destroy the client side structures when the drawable is no long current for a context. --- src/glx/dri2.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/glx/dri2.c') diff --git a/src/glx/dri2.c b/src/glx/dri2.c index d70ec5a3ecf..d4108986489 100644 --- a/src/glx/dri2.c +++ b/src/glx/dri2.c @@ -175,6 +175,14 @@ DRI2Error(Display *display, xError *err, XExtCodes *codes, int *ret_code) err->minorCode == X_DRI2CopyRegion) return True; + /* If the X drawable was destroyed before the GLX drawable, the + * DRI2 drawble will be gone by the time we call + * DRI2DestroyDrawable. So just ignore BadDrawable here. */ + if (err->majorCode == codes->major_opcode && + err->errorCode == BadDrawable && + err->minorCode == X_DRI2DestroyDrawable) + return True; + return False; } -- cgit v1.2.3