Attachment 93487 Details for Bug 74143 – Fix for GLX makecurrent with None drawable/readable.

[patch] Fix for GLX makecurrent with None drawable/readable.

0001-glx-Pass-NULL-DRI-drawables-into-the-DRI-driver-for-.patch (text/plain), 2.96 KB, created by Kristian Høgsberg on 2014-02-05 19:47:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Høgsberg

Created: 2014-02-05 19:47:36 UTC

Size: 2.96 KB

patch

obsolete

>From d64c4a62d82f0c3ebb216be84d93e5622380604c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
>Date: Wed, 5 Feb 2014 11:43:58 -0800
>Subject: [PATCH] glx: Pass NULL DRI drawables into the DRI driver for None GLX
> drawables
>
>GLX_ARB_create_context allows making a GLX context current with None
>drawable and readables, but this was never implemented correctly in GLX.
>We would create a __DRIdrawable for the None GLX drawable and pass that
>to the DRI driver and that would somehow work.  Now it's somehow broken.
>
>The way this should have worked is that we pass a NULL DRI drawable
>to the DRI driver when the GLX user calls glXMakeContextCurrent()
>with None for drawable and readables.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=74143
>---
> src/glx/dri2_glx.c   | 17 ++++++++++++-----
> src/glx/dri_common.c |  3 +++
> 2 files changed, 15 insertions(+), 5 deletions(-)
>
>diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
>index 0a0dac9..67fe9c1 100644
>--- a/src/glx/dri2_glx.c
>+++ b/src/glx/dri2_glx.c
>@@ -141,6 +141,7 @@ dri2_bind_context(struct glx_context *context, struct glx_context *old,
>    struct dri2_context *pcp = (struct dri2_context *) context;
>    struct dri2_screen *psc = (struct dri2_screen *) pcp->base.psc;
>    struct dri2_drawable *pdraw, *pread;
>+   __DRIdrawable *dri_draw = NULL, *dri_read = NULL;
>    struct dri2_display *pdp;
> 
>    pdraw = (struct dri2_drawable *) driFetchDrawable(context, draw);
>@@ -148,20 +149,26 @@ dri2_bind_context(struct glx_context *context, struct glx_context *old,
> 
>    driReleaseDrawables(&pcp->base);
> 
>-   if (pdraw == NULL || pread == NULL)
>+   if (pdraw)
>+      dri_draw = pdraw->driDrawable;
>+   else if (draw != None)
>       return GLXBadDrawable;
> 
>-   if (!(*psc->core->bindContext) (pcp->driContext,
>-				   pdraw->driDrawable, pread->driDrawable))
>+   if (pread)
>+      dri_read = pread->driDrawable;
>+   else if (read != None)
>+      return GLXBadDrawable;
>+
>+   if (!(*psc->core->bindContext) (pcp->driContext, dri_draw, dri_read))
>       return GLXBadContext;
> 
>    /* If the server doesn't send invalidate events, we may miss a
>     * resize before the rendering starts.  Invalidate the buffers now
>     * so the driver will recheck before rendering starts. */
>    pdp = (struct dri2_display *) psc->base.display;
>-   if (!pdp->invalidateAvailable) {
>+   if (!pdp->invalidateAvailable && pdraw) {
>       dri2InvalidateBuffers(psc->base.dpy, pdraw->base.xDrawable);
>-      if (pread != pdraw)
>+      if (pread != pdraw && pread)
> 	 dri2InvalidateBuffers(psc->base.dpy, pread->base.xDrawable);
>    }
> 
>diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
>index 0dd8982..012c8f4 100644
>--- a/src/glx/dri_common.c
>+++ b/src/glx/dri_common.c
>@@ -392,6 +392,9 @@ driFetchDrawable(struct glx_context *gc, GLXDrawable glxDrawable)
>    if (priv == NULL)
>       return NULL;
> 
>+   if (glxDrawable == None)
>+      return NULL;
>+
>    psc = priv->screens[gc->screen];
>    if (priv->drawHash == NULL)
>       return NULL;
>-- 
>1.8.4.2
>

Actions: View | Splinter Review

Attachments on bug 74143: 93282 | 93487

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.