summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChad Versace <[email protected]>2016-10-12 15:52:12 -0700
committerEmil Velikov <[email protected]>2016-11-08 16:23:19 +0000
commit341889d6ca85b9c7346e656b2eb65ac1007756a4 (patch)
treed03f05bb5fbcc848760dc0d911c030c0429866f1 /src
parent866aee0264e9c6b9894b6533d6a912264bd20bd2 (diff)
egl: Don't advertise unsupported platform extensions
Mesa's set of supported platform extensions depends on the autoconf option --with-egl-platforms=foo,bar,baz. If --with-egl-platforms lacks foo, then eglGetPlatformDisplay(EGL_PLATFORM_FOO, ...) unconditonally fails. So, if --with-egl-platforms lacks foo, then remove EGL_VENDOR_platform_foo from the EGL client extension string. Cc: [email protected] Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit c177ef9d47943f648a13beed14269f468583c16e) [Emil Velikov: resolve trivial conflicts] Signed-off-by: Emil Velikov <[email protected]> Conflicts: src/egl/main/eglglobals.c
Diffstat (limited to 'src')
-rw-r--r--src/egl/main/eglglobals.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c
index 938d9537891..1be679739fe 100644
--- a/src/egl/main/eglglobals.c
+++ b/src/egl/main/eglglobals.c
@@ -53,10 +53,16 @@ struct _egl_global _eglGlobal =
/* ClientExtensionsString */
"EGL_EXT_client_extensions"
" EGL_EXT_platform_base"
+#ifdef HAVE_WAYLAND_PLATFORM
" EGL_EXT_platform_wayland"
+#endif
+#ifdef HAVE_X11_PLATFORM
" EGL_EXT_platform_x11"
- " EGL_KHR_client_get_all_proc_addresses"
+#endif
+#ifdef HAVE_DRM_PLATFORM
" EGL_MESA_platform_gbm"
+#endif
+ " EGL_KHR_client_get_all_proc_addresses"
};