[Piglit] [PATCH 08/18] util: Disable piglit_glx_window_set_no_input when using Waffle

Chad Versace chad.versace at linux.intel.com
Tue May 22 18:01:48 PDT 2012


From: Chad Versace <chad at chad.versace.us>

Use #ifdef to disable the function because, when using Waffle and Mesa,
XSetWMHints() causes the next emission of DRI2SwapBuffers to fail with
BadWindow(X_ChangeProperty). Comment this with FIXME.

Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
Signed-off-by: Chad Versace <chad at chad.versace.us>
---
 tests/util/piglit-glx-util.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/util/piglit-glx-util.c b/tests/util/piglit-glx-util.c
index df54c50..ad71790 100644
--- a/tests/util/piglit-glx-util.c
+++ b/tests/util/piglit-glx-util.c
@@ -224,6 +224,11 @@ piglit_iterate_visuals_event_loop(Display *dpy,
 void
 piglit_glx_window_set_no_input(Display *dpy, GLXDrawable win)
 {
+	/* FIXME: When using Waffle and Mesa, this function causes the next
+	 * FIXME: emission DRI2SwapBuffers to fail with
+	 * FIXME: BadWindow(X_ChangeProperty).
+	 */
+#ifndef USE_WAFFLE
 	XWMHints *hints;
 	hints = XAllocWMHints();
 	hints->flags |= InputHint;
@@ -232,6 +237,7 @@ piglit_glx_window_set_no_input(Display *dpy, GLXDrawable win)
 	XSetWMHints(dpy, win, hints);
 
 	XFree(hints);
+#endif
 }
 
 void
-- 
1.7.10.1



More information about the Piglit mailing list