Attachment 113030 Details for Bug 79629 – it should fix this issue

it should fix this issue

0001-dri3_glx.c-Pass-NULL-DRI-drawables-into-driver-for-N.patch (text/plain), 1.90 KB, created by XiongZhang on 2015-02-02 03:17:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: XiongZhang

Created: 2015-02-02 03:17:17 UTC

Size: 1.90 KB

patch

obsolete

>From b7dff0d4e5fecbd4ed9a4cf08aeeb3e9b117ad0e Mon Sep 17 00:00:00 2001
>From: Xiong Zhang <xiong.y.zhang@intel.com>
>Date: Mon, 2 Feb 2015 10:34:45 +0800
>Subject: [PATCH] dri3_glx.c: Pass NULL DRI drawables into driver for None GLX
> drawables
>
>GLX_ARB_create_context spec says:
>If either <draw> or <read> are not a valid GLX drawable, a GLXBadDrawable
>error is generated, unless <draw> and <read> are both None and the OpenGL
>version supported by <ctx> is 3.0 or greater.
>
>So when both <draw> and <read> are None, it could pass NULL drawable into
>driver instead of returing GLXBadDrawable.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=79629
>Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.com>
>---
> src/glx/dri3_glx.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
>diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
>index 1ddc723..9cd0aab 100644
>--- a/src/glx/dri3_glx.c
>+++ b/src/glx/dri3_glx.c
>@@ -133,17 +133,24 @@ dri3_bind_context(struct glx_context *context, struct glx_context *old,
>    struct dri3_context *pcp = (struct dri3_context *) context;
>    struct dri3_screen *psc = (struct dri3_screen *) pcp->base.psc;
>    struct dri3_drawable *pdraw, *pread;
>+   __DRIdrawable *dri_draw = NULL, *dri_read = NULL;
> 
>    pdraw = (struct dri3_drawable *) driFetchDrawable(context, draw);
>    pread = (struct dri3_drawable *) driFetchDrawable(context, read);
> 
>    driReleaseDrawables(&pcp->base);
> 
>-   if (pdraw == NULL || pread == NULL)
>+   if ((pdraw == NULL && draw != None) ||
>+		(pread == NULL && read != None))
>       return GLXBadDrawable;
> 
>-   if (!(*psc->core->bindContext) (pcp->driContext,
>-                                   pdraw->driDrawable, pread->driDrawable))
>+   if (pdraw)
>+	   dri_draw = pdraw->driDrawable;
>+
>+   if (pread)
>+	   dri_read = pread->driDrawable;
>+
>+   if (!(*psc->core->bindContext) (pcp->driContext, dri_draw, dri_read))
>       return GLXBadContext;
> 
>    return Success;
>-- 
>2.1.4
>

Actions: View

Attachments on bug 79629: 101740 | 113030

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.