Module: Mesa
Branch: master
Commit: 033cfb17db85b38bc012d74f30f6c92cddf85216
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=033cfb17db85b38bc012d74f30f6c92cddf85216
Author: Adam Jackson <a...@redhat.com>
Date: Thu Nov 9 16:57:30 2017 -0500
glx/drisw: Fix glXMakeCurrent(dpy, None, ctx)
This is perfectly legal in GL 3.0+.
Fixes piglit/glx-create-context-current-no-framebuffer.
Cc: mesa-sta...@lists.freedesktop.org
Reviewed-by: Tapani Pälli <tapani.pa...@intel.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
Signed-off-by: Adam Jackson <a...@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;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
