glx: Add function to check minimum GLX version

2 files changed, 20 insertions, 0 deletions

diff --git a/tests/util/piglit-glx-util.c b/tests/util/piglit-glx-util.c
index 66870ecdd..419b64777 100644
--- a/tests/util/piglit-glx-util.c
+++ b/tests/util/piglit-glx-util.c
@@ -122,6 +122,25 @@ piglit_require_glx_extension(Display *dpy, const char *name)
 
 
 void
+piglit_require_glx_version(Display *dpy, int major, int minor)
+{
+	int glxMajor;
+	int glxMinor;
+
+	if (! glXQueryVersion(dpy, & glxMajor, & glxMinor)) {
+		fprintf(stderr, "Could not query GLX version!\n");
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	if (glxMajor != major || glxMinor < minor) {
+		fprintf(stderr, "Test requires GLX %d.%d.  Got %d.%d.\n",
+			major, minor, glxMajor, glxMinor);
+		piglit_report_result(PIGLIT_SKIP);
+	}
+}
+
+
+void
 piglit_glx_event_loop(Display *dpy, enum piglit_result (*draw)(Display *dpy))
 {
 	for (;;) {
diff --git a/tests/util/piglit-glx-util.h b/tests/util/piglit-glx-util.h
index 36f759821..8d3f20a55 100644
--- a/tests/util/piglit-glx-util.h
+++ b/tests/util/piglit-glx-util.h
@@ -34,6 +34,7 @@ GLXContext piglit_get_glx_context(Display *dpy, XVisualInfo *visinfo);
 GLXContext piglit_get_glx_context_share(Display *dpy, XVisualInfo *visinfo, GLXContext share);
 Window piglit_get_glx_window(Display *dpy, XVisualInfo *visinfo);
 void piglit_require_glx_extension(Display *dpy, const char *name);
+void piglit_require_glx_version(Display *dpy, int major, int minor);
 void piglit_glx_event_loop(Display *dpy,
 			   enum piglit_result (*draw)(Display *dpy));
 void piglit_glx_set_no_input(void);