[Mesa-dev] [PATCH 2/3] glx/drisw: Fix glXMakeCurrent(dpy, None, ctx)

[Adam Jackson]

This is perfectly legal in GL 3.0+.

Fixes piglit/glx-create-context-no-current-framebuffer.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 src/glx/drisw_glx.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 2f0675addb..df2467a5c2 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -255,11 +255,9 @@ drisw_bind_context(struct glx_context *context, struct glx_context *old,
 
    driReleaseDrawables(&pcp->base);
 
-   if (pdraw == NULL || pread == NULL)
-      return GLXBadDrawable;
-
    if ((*psc->core->bindContext) (pcp->driContext,
-				  pdraw->driDrawable, pread->driDrawable))
+                                  pdraw ? pdraw->driDrawable : NULL,
+                                  pread ? pread->driDrawable : NULL))
       return Success;
 
    return GLXBadContext;
-- 
2.14.3