Module: Mesa
Branch: master
Commit: e166a58c43e92f10f03b32747bff44708096f898
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e166a58c43e92f10f03b32747bff44708096f898
Author: Adam Jackson <a...@redhat.com>
Date: Fri Oct 4 09:25:51 2013 -0400
glx: Generate fewer errors in MakeContextCurrent
For a few reasons.
1: In the (current) common case, these conditionals are never true. All
we're doing by checking them is slowing down MakeCurrent. The server
does these checks already anyway.
2: GLX >= 3.0 contexts may legally be made current without a bound
framebuffer.
This does not fix piglit/glx-create-context-current-no-framebuffer, but
is a prerequisite for fixing it.
Cc: "9.1 9.2" <mesa-sta...@lists.freedesktop.org>
Reviewed-by: Brian Paul <bri...@vmware.com>
Signed-off-by: Adam Jackson <a...@redhat.com>
---
src/glx/glxcurrent.c | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/src/glx/glxcurrent.c b/src/glx/glxcurrent.c
index 3d8893c..a6884cf 100644
--- a/src/glx/glxcurrent.c
+++ b/src/glx/glxcurrent.c
@@ -231,16 +231,6 @@ 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
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
