Module: Mesa Branch: 9.2 Commit: 82d5b5e20ff8ad58f4d4eb4a94ba5fe9b4cb52be URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=82d5b5e20ff8ad58f4d4eb4a94ba5fe9b4cb52be
Author: Carl Worth <[email protected]> Date: Thu Oct 17 11:30:26 2013 -0700 Revert "glx: Generate fewer errors in MakeContextCurrent" This reverts commit fb3e55f898e047ed32008e8a579146090cc8f805. This commit was identified as causing the piglit glx-create-context-current-no-framebuffer test to crash, (where, previously, it merely failed without crashing). --- src/glx/glxcurrent.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/glx/glxcurrent.c b/src/glx/glxcurrent.c index a6884cf..3d8893c 100644 --- a/src/glx/glxcurrent.c +++ b/src/glx/glxcurrent.c @@ -231,6 +231,16 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw, return GL_FALSE; } + if (gc == NULL && (draw != None || read != None)) { + __glXGenerateError(dpy, (draw != None) ? draw : read, + BadMatch, X_GLXMakeContextCurrent); + return False; + } + if (gc != NULL && (draw == None || read == None)) { + __glXGenerateError(dpy, None, BadMatch, X_GLXMakeContextCurrent); + return False; + } + _glapi_check_multithread(); __glXLock(); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
