diff options
| author | Pauli Nieminen <pauli.nieminen@linux.intel.com> | 2012-04-27 15:02:12 +0300 |
|---|---|---|
| committer | Pauli Nieminen <pauli.nieminen@linux.intel.com> | 2012-04-27 15:58:13 +0300 |
| commit | cc100547d5ec3089e227d345f9e249c5729cf766 (patch) | |
| tree | b573e409bd24bac88808f1962707f4bad6237704 | |
| parent | f2ef7b98ac3ae4f70f828e5cfa866cc2837c0476 (diff) | |
util: Check that glx is supported in the selected platform
This allows runtime skiping of glx tests if we are running piglit using
egl.
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
| -rw-r--r-- | tests/util/piglit-glx-util.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/util/piglit-glx-util.c b/tests/util/piglit-glx-util.c index df54c503..21807903 100644 --- a/tests/util/piglit-glx-util.c +++ b/tests/util/piglit-glx-util.c @@ -27,6 +27,7 @@ #include "piglit-util.h" #include "piglit-glx-util.h" +#include <waffle/waffle.h> #ifndef GLXBadProfileARB #define GLXBadProfileARB 13 @@ -142,12 +143,20 @@ piglit_is_glx_extension_supported(Display *dpy, const char *name) const char *const glx_extension_list = glXQueryExtensionsString(dpy, screen); + if (glutGetPlatform() != WAFFLE_PLATFORM_GLX) + return false; + return piglit_is_extension_in_string(glx_extension_list, name); } void piglit_require_glx_extension(Display *dpy, const char *name) { + if (glutGetPlatform() != WAFFLE_PLATFORM_GLX) { + fprintf(stderr, "GLX test running in platform without GLX\n"); + piglit_report_result(PIGLIT_SKIP); + } + if (!piglit_is_glx_extension_supported(dpy, name)) { fprintf(stderr, "Test requires %s\n", name); piglit_report_result(PIGLIT_SKIP); @@ -161,6 +170,11 @@ piglit_require_glx_version(Display *dpy, int major, int minor) int glxMajor; int glxMinor; + if (glutGetPlatform() != WAFFLE_PLATFORM_GLX) { + fprintf(stderr, "GLX test running in platform without GLX\n"); + piglit_report_result(PIGLIT_SKIP); + } + if (! glXQueryVersion(dpy, & glxMajor, & glxMinor)) { fprintf(stderr, "Could not query GLX version!\n"); piglit_report_result(PIGLIT_FAIL); |