Attachment 49295 Details for Bug 39219 – patch

[patch] patch

patch.diff (text/plain), 1.42 KB, created by Henri Verbeet on 2011-07-19 04:10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Henri Verbeet

Created: 2011-07-19 04:10:11 UTC

Size: 1.42 KB

patch

obsolete

>diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
>index bac0c9e..e7dba5a 100644
>--- a/src/glx/dri_common.c
>+++ b/src/glx/dri_common.c
>@@ -388,7 +388,7 @@ driFetchDrawable(struct glx_context *gc, GLXDrawable glxDrawable)
> _X_HIDDEN void
> driReleaseDrawables(struct glx_context *gc)
> {
>-   struct glx_display *const priv = __glXInitialize(gc->psc->dpy);
>+   const struct glx_display *priv = gc->psc->display;
>    __GLXDRIdrawable *pdraw;
> 
>    if (priv == NULL)
>diff --git a/src/glx/glxext.c b/src/glx/glxext.c
>index 8704c48..8254544 100644
>--- a/src/glx/glxext.c
>+++ b/src/glx/glxext.c
>@@ -260,24 +260,19 @@ glx_display_free(struct glx_display *priv)
> static int
> __glXCloseDisplay(Display * dpy, XExtCodes * codes)
> {
>-   struct glx_display *priv, **prev, *next;
>+   struct glx_display *priv, **prev;
> 
>    _XLockMutex(_Xglobal_lock);
>    prev = &glx_displays;
>    for (priv = glx_displays; priv; prev = &priv->next, priv = priv->next) {
>       if (priv->dpy == dpy) {
>+         *prev = priv->next;
> 	 break;
>       }
>    }
>+   _XUnlockMutex(_Xglobal_lock);
> 
>-   /* Only remove the display from the list after it's destroyed. The cleanup
>-    * code (e.g. driReleaseDrawables()) ends up calling __glXInitialize(),
>-    * which would create a new glx_display while we're trying to destroy this
>-    * one. */
>-   next = priv->next;
>    glx_display_free(priv);
>-   *prev = next;
>-   _XUnlockMutex(_Xglobal_lock);
> 
>    return 1;
> }
>-- 
>1.7.2.5
>

Actions: View | Splinter Review

Attachments on bug 39219: 49074 | 49135 | 49165 | 49295

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.