Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 3a93150bc0aec86afdb7d053247dc2448925e09a Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
| 3 | Date: Wed, 6 May 2015 10:45:22 +0200 |
| 4 | Subject: [PATCH 1/2] select platforms based on configuration results |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Upstream-Status: Submitted [1] |
| 10 | |
| 11 | [1] https://github.com/anholt/libepoxy/pull/52 |
| 12 | |
| 13 | Signed-off-by: Andreas MΓΌller <schnitzeltony@googlemail.com> |
| 14 | --- |
| 15 | configure.ac | 13 +++++-------- |
| 16 | src/dispatch_common.c | 9 ++++++--- |
| 17 | src/dispatch_common.h | 9 +++++---- |
| 18 | 3 files changed, 16 insertions(+), 15 deletions(-) |
| 19 | |
| 20 | diff --git a/configure.ac b/configure.ac |
| 21 | index a52fc58..bdd70da 100644 |
| 22 | --- a/configure.ac |
| 23 | +++ b/configure.ac |
| 24 | @@ -58,6 +58,10 @@ AC_CHECK_HEADER([KHR/khrplatform.h], |
| 25 | # uintptr_t to a void *") by default. Kill that. |
| 26 | XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion]) |
| 27 | |
| 28 | +PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no]) |
| 29 | + |
| 30 | +AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) |
| 31 | + |
| 32 | has_znow=yes |
| 33 | |
| 34 | case $host_os in |
| 35 | @@ -86,7 +90,7 @@ case $host_os in |
| 36 | ;; |
| 37 | *) |
| 38 | build_egl=yes |
| 39 | - build_glx=yes |
| 40 | + build_glx=$x11 |
| 41 | build_wgl=no |
| 42 | # On platforms with dlopen, we load everything dynamically and |
| 43 | # don't link against a specific window system or GL implementation. |
| 44 | @@ -144,13 +148,6 @@ esac |
| 45 | |
| 46 | AC_SUBST([VISIBILITY_CFLAGS]) |
| 47 | |
| 48 | -PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no]) |
| 49 | -if test x$x11 = xno -a x$build_glx = xyes; then |
| 50 | - AC_MSG_ERROR([libX11 headers (libx11-dev) required to build with GLX support]) |
| 51 | -fi |
| 52 | - |
| 53 | -AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) |
| 54 | - |
| 55 | PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no]) |
| 56 | |
| 57 | AC_CONFIG_FILES([ |
| 58 | diff --git a/src/dispatch_common.c b/src/dispatch_common.c |
| 59 | index 4e34d6e..2ab84ed 100644 |
| 60 | --- a/src/dispatch_common.c |
| 61 | +++ b/src/dispatch_common.c |
| 62 | @@ -615,10 +615,13 @@ epoxy_get_proc_address(const char *name) |
| 63 | #elif defined(__APPLE__) |
| 64 | return epoxy_gl_dlsym(name); |
| 65 | #else |
| 66 | +#if PLATFORM_HAS_GLX |
| 67 | if (epoxy_current_context_is_glx()) { |
| 68 | return glXGetProcAddressARB((const GLubyte *)name); |
| 69 | - } else { |
| 70 | + } else |
| 71 | +#endif /* PLATFORM_HAS_GLX */ |
| 72 | #if PLATFORM_HAS_EGL |
| 73 | + { |
| 74 | GLenum egl_api = epoxy_egl_get_current_gl_context_api(); |
| 75 | |
| 76 | switch (egl_api) { |
| 77 | @@ -628,10 +631,10 @@ epoxy_get_proc_address(const char *name) |
| 78 | case EGL_NONE: |
| 79 | break; |
| 80 | } |
| 81 | -#endif |
| 82 | } |
| 83 | +#endif /* PLATFORM_HAS_EGL */ |
| 84 | errx(1, "Couldn't find current GLX or EGL context.\n"); |
| 85 | -#endif |
| 86 | +#endif /* _WIN32 | __APPLE__*/ |
| 87 | } |
| 88 | |
| 89 | void |
| 90 | diff --git a/src/dispatch_common.h b/src/dispatch_common.h |
| 91 | index 6b8503a..82681e4 100644 |
| 92 | --- a/src/dispatch_common.h |
| 93 | +++ b/src/dispatch_common.h |
| 94 | @@ -21,12 +21,13 @@ |
| 95 | * IN THE SOFTWARE. |
| 96 | */ |
| 97 | |
| 98 | +#include <config.h> |
| 99 | #include <stdbool.h> |
| 100 | |
| 101 | #ifdef _WIN32 |
| 102 | #define PLATFORM_HAS_EGL 0 |
| 103 | #define PLATFORM_HAS_GLX 0 |
| 104 | -#define PLATFORM_HAS_WGL 1 |
| 105 | +#define PLATFORM_HAS_WGL BUILD_WGL |
| 106 | #define EPOXY_IMPORTEXPORT __declspec(dllexport) |
| 107 | #elif defined(__APPLE__) |
| 108 | #define PLATFORM_HAS_EGL 0 |
| 109 | @@ -34,13 +35,13 @@ |
| 110 | #define PLATFORM_HAS_WGL 0 |
| 111 | #define EPOXY_IMPORTEXPORT |
| 112 | #elif defined(ANDROID) |
| 113 | -#define PLATFORM_HAS_EGL 1 |
| 114 | +#define PLATFORM_HAS_EGL BUILD_EGL |
| 115 | #define PLATFORM_HAS_GLX 0 |
| 116 | #define PLATFORM_HAS_WGL 0 |
| 117 | #define EPOXY_IMPORTEXPORT |
| 118 | #else |
| 119 | -#define PLATFORM_HAS_EGL 1 |
| 120 | -#define PLATFORM_HAS_GLX 1 |
| 121 | +#define PLATFORM_HAS_EGL BUILD_EGL |
| 122 | +#define PLATFORM_HAS_GLX BUILD_GLX |
| 123 | #define PLATFORM_HAS_WGL 0 |
| 124 | #define EPOXY_IMPORTEXPORT |
| 125 | #endif |
| 126 | -- |
| 127 | 1.9.3 |
| 128 | |