mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

platform: provide platform_base fallbacks and remove ifdefs

Browse Source 
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Jonny Lamb 2015-03-24 13:12:07 +01:00 committed by Pekka Paalanen
parent 5c332900f7
commit 0e2ab36df7
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
shared/platform.h
View File

@ -25,26 +25,32 @@
#include <string.h> #include <string.h>
#ifdef ENABLE_EGL
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#endif
#ifndef EGL_PLATFORM_WAYLAND_KHR
#define EGL_PLATFORM_WAYLAND_KHR 0x31D8
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifdef EGL_EXT_platform_base #ifdef ENABLE_EGL
#ifndef EGL_EXT_platform_base
typedef void (*PFNEGLGETPLATFORMDISPLAYEXTPROC) (void);
typedef void (*PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (void);
#endif
static PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display_ext = NULL; static PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display_ext = NULL;
static PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window_surface_ext = NULL; static PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window_surface_ext = NULL;
#ifndef EGL_PLATFORM_WAYLAND_KHR
#define EGL_PLATFORM_WAYLAND_KHR 0x31D8
#endif
#endif /* EGL_EXT_platform_base */
static inline void static inline void
weston_platform_get_egl_proc_addresses(void) weston_platform_get_egl_proc_addresses(void)
{ {
#ifdef EGL_EXT_platform_base
if (!get_platform_display_ext) { if (!get_platform_display_ext) {
const char *extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS); const char *extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
@ -56,23 +62,20 @@ weston_platform_get_egl_proc_addresses(void)
(void *) eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT"); (void *) eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT");
} }
} }
#endif
} }
static inline EGLDisplay static inline EGLDisplay
weston_platform_get_egl_display(EGLenum platform, void *native_display, weston_platform_get_egl_display(EGLenum platform, void *native_display,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
#ifdef EGL_EXT_platform_base
if (!get_platform_display_ext) if (!get_platform_display_ext)
weston_platform_get_egl_proc_addresses(); weston_platform_get_egl_proc_addresses();
if (get_platform_display_ext) if (get_platform_display_ext)
return get_platform_display_ext(platform, return get_platform_display_ext(platform,
native_display, attrib_list); native_display, attrib_list);
else
#endif return eglGetDisplay((EGLNativeDisplayType) native_display);
return eglGetDisplay((EGLNativeDisplayType) native_display);
} }
static inline EGLSurface static inline EGLSurface
@ -80,7 +83,6 @@ weston_platform_create_egl_window(EGLDisplay dpy, EGLConfig config,
void *native_window, void *native_window,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
#ifdef EGL_EXT_platform_base
if (!create_platform_window_surface_ext) if (!create_platform_window_surface_ext)
weston_platform_get_egl_proc_addresses(); weston_platform_get_egl_proc_addresses();
@ -88,13 +90,30 @@ weston_platform_create_egl_window(EGLDisplay dpy, EGLConfig config,
return create_platform_window_surface_ext(dpy, config, return create_platform_window_surface_ext(dpy, config,
native_window, native_window,
attrib_list); attrib_list);
#endif
return eglCreateWindowSurface(dpy, config, return eglCreateWindowSurface(dpy, config,
(EGLNativeWindowType) native_window, (EGLNativeWindowType) native_window,
attrib_list); attrib_list);
} }
#else /* ENABLE_EGL */
static inline void *
weston_platform_get_egl_display(void *platform, void *native_display,
const int *attrib_list)
{
return NULL;
}
static inline void *
weston_platform_create_egl_window(void *dpy, void *config,
void *native_window,
const int *attrib_list)
{
return NULL;
}
#endif /* ENABLE_EGL */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif