system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-24 04:04:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

platform: remove global variables

Browse source 
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Jonny Lamb 2015-03-24 13:12:08 +01:00 committed by Pekka Paalanen
parent 0e2ab36df7
commit 759fbf4d0f
1 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
shared/platform.h
View file

@ -45,35 +45,33 @@ typedef void (*PFNEGLGETPLATFORMDISPLAYEXTPROC) (void);
typedef void (*PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (void); typedef void (*PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (void);
#endif #endif
static PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display_ext = NULL; static inline void *
static PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window_surface_ext = NULL; weston_platform_get_egl_proc_address(const char *address)
static inline void
weston_platform_get_egl_proc_addresses(void)
{ {
if (!get_platform_display_ext) { const char *extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
const char *extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
if (strstr(extensions, "EGL_EXT_platform_wayland") if (strstr(extensions, "EGL_EXT_platform_wayland")
|| strstr(extensions, "EGL_KHR_platform_wayland")) { || strstr(extensions, "EGL_KHR_platform_wayland")) {
get_platform_display_ext = return (void *) eglGetProcAddress(address);
(void *) eglGetProcAddress("eglGetPlatformDisplayEXT");
create_platform_window_surface_ext =
(void *) eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT");
}
} }
return NULL;
} }
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)
{ {
if (!get_platform_display_ext) static PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display = NULL;
weston_platform_get_egl_proc_addresses();
if (get_platform_display_ext) if (!get_platform_display) {
return get_platform_display_ext(platform, get_platform_display = weston_platform_get_egl_proc_address(
native_display, attrib_list); "eglGetPlatformDisplayEXT");
}
if (get_platform_display)
return get_platform_display(platform,
native_display, attrib_list);
return eglGetDisplay((EGLNativeDisplayType) native_display); return eglGetDisplay((EGLNativeDisplayType) native_display);
} }
@ -83,13 +81,18 @@ weston_platform_create_egl_window(EGLDisplay dpy, EGLConfig config,
void *native_window, void *native_window,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
if (!create_platform_window_surface_ext) static PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC
weston_platform_get_egl_proc_addresses(); create_platform_window = NULL;
if (create_platform_window_surface_ext) if (!create_platform_window) {
return create_platform_window_surface_ext(dpy, config, create_platform_window = weston_platform_get_egl_proc_address(
native_window, "eglCreatePlatformWindowSurfaceEXT");
attrib_list); }
if (create_platform_window)
return create_platform_window(dpy, config,
native_window,
attrib_list);
return eglCreateWindowSurface(dpy, config, return eglCreateWindowSurface(dpy, config,
(EGLNativeWindowType) native_window, (EGLNativeWindowType) native_window,