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-05-31 18:42:27 +0300 |
| commit | 13b924d9657046545be15972dd82f614ed3be7ca (patch) | |
| tree | 11d413ca89538d3c86cf13d94e722f4532d4e991 | |
| parent | 99c95316413a0f5daab6d4d4ca48703d54a88929 (diff) | |
util: Check that glx is supported in the selected platform
Check in runtime if current platform is glx before trying to check glX
versions or extensions.
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
| -rw-r--r-- | tests/util/piglit-glx-util.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/tests/util/piglit-glx-util.c b/tests/util/piglit-glx-util.c index 069ea72d..12f1b672 100644 --- a/tests/util/piglit-glx-util.c +++ b/tests/util/piglit-glx-util.c @@ -144,8 +144,12 @@ bool piglit_is_glx_extension_supported(Display *dpy, const char *name) { int screen = DefaultScreen(dpy); - const char *const glx_extension_list = - glXQueryExtensionsString(dpy, screen); + const char * glx_extension_list; + + if (!piglit_platform_is_glx()) + return false; + + glx_extension_list = glXQueryExtensionsString(dpy, screen); return piglit_is_extension_in_string(glx_extension_list, name); } @@ -153,6 +157,11 @@ piglit_is_glx_extension_supported(Display *dpy, const char *name) void piglit_require_glx_extension(Display *dpy, const char *name) { + if (!piglit_platform_is_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); @@ -166,6 +175,11 @@ piglit_require_glx_version(Display *dpy, int major, int minor) int glxMajor; int glxMinor; + if (!piglit_platform_is_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); |