From b6670157d742548e7f2430614786c733eb4c20e9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fredrik=20H=C3=B6glund?= Date: Sun, 1 Jan 2017 15:34:17 +0100 Subject: [PATCH] dri3: Fix MakeCurrent without a default framebuffer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In OpenGL 3.0 and later it is legal to make a context current without a default framebuffer. This has been broken since DRI3 support was introduced. Cc: "13.0 12.0" Reviewed-by: Marek Olšák --- src/glx/dri3_glx.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index 358bd5f9feb..4472a0bed26 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -209,18 +209,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) + dri_draw = pdraw->loader_drawable.dri_drawable; + else if (draw != None) return GLXBadDrawable; - if (!(*psc->core->bindContext) (pcp->driContext, - pdraw->loader_drawable.dri_drawable, - pread->loader_drawable.dri_drawable)) + if (pread) + dri_read = pread->loader_drawable.dri_drawable; + else if (read != None) + return GLXBadDrawable; + + if (!(*psc->core->bindContext) (pcp->driContext, dri_draw, dri_read)) return GLXBadContext; return Success; -- 2.30.2