diff options
| author | Eric Anholt <eric@anholt.net> | 2013-12-04 18:45:52 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-12-04 19:18:31 -0800 |
| commit | 0f67bf3f1192fb0bbd0b868eeb73a18f76951b01 (patch) | |
| tree | 8ae10824b0fcd93f0fb6fc4d38372b932cda5425 /test | |
| parent | 14f822ee91adc1531b7689d2f6083cdb1476154d (diff) | |
Fix bug in public entrypoint for epoxy_glx_version()
Unfortunately, for GLX 1.4+ entrypoints (just glxGetProcAddress
currently) or extensions, if there isn't a context bound then we don't
have a dpy and screen available to provide useful debug messages. Oh
well.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/glx_glxgetprocaddress_nocontext.c | 2 | ||||
| -rw-r--r-- | test/glx_public_api.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 6fdfdae..4023b31 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -37,8 +37,6 @@ TESTS = \ headerguards \ $() -XFAIL_TESTS = glx_glxgetprocaddress_nocontext - check_PROGRAMS = $(TESTS) glx_public_api_LDFLAGS = $(X11_LIBS) $(EPOXY) libglx_common.la diff --git a/test/glx_glxgetprocaddress_nocontext.c b/test/glx_glxgetprocaddress_nocontext.c index 3ab2c09..3d12bf4 100644 --- a/test/glx_glxgetprocaddress_nocontext.c +++ b/test/glx_glxgetprocaddress_nocontext.c @@ -45,7 +45,7 @@ main(int argc, char **argv) bool pass = true; dpy = get_display_or_skip(); - if (epoxy_glx_version() < 14) + if (epoxy_glx_version(dpy, 0) < 14) errx(77, "GLX version 1.4 required for glXGetProcAddress().\n"); void *func = glXGetProcAddress("glGetString"); diff --git a/test/glx_public_api.c b/test/glx_public_api.c index 1eab7bf..e89a4a4 100644 --- a/test/glx_public_api.c +++ b/test/glx_public_api.c @@ -48,7 +48,7 @@ test_gl_version(void) static bool test_glx_version(void) { - int version = epoxy_glx_version(); + int version = epoxy_glx_version(dpy, 0); const char *version_string; int ret; int server_major, server_minor; |