gl-renderer: use eglCreatePlatformWindowSurfaceEXT to get EGLSurfaces
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 29f0f13..450920e 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -1627,7 +1627,8 @@
return -1;
}
- if (gl_renderer->output_create(&output->base, output->surface,
+ if (gl_renderer->output_create(&output->base,
+ output->surface, output->surface,
gl_renderer->opaque_attribs,
&format) < 0) {
weston_log("failed to create gl renderer output state\n");
diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
index 6e541e8..b71affb 100644
--- a/src/compositor-fbdev.c
+++ b/src/compositor-fbdev.c
@@ -568,7 +568,7 @@
} else {
setenv("HYBRIS_EGLPLATFORM", "wayland", 1);
if (gl_renderer->output_create(&output->base,
- (EGLNativeWindowType)NULL,
+ (EGLNativeWindowType)NULL, NULL,
gl_renderer->opaque_attribs,
NULL) < 0) {
weston_log("gl_renderer_output_create failed.\n");
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index b6fd37d..4f792b1 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -645,6 +645,7 @@
if (gl_renderer->output_create(&output->base,
output->gl.egl_window,
+ output->gl.egl_window,
gl_renderer->alpha_attribs,
NULL) < 0)
goto cleanup_window;
diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index a435daf..5654c50 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -904,8 +904,13 @@
return NULL;
}
} else {
+ /* eglCreatePlatformWindowSurfaceEXT takes a Window*
+ * but eglCreateWindowSurface takes a Window. */
+ Window xid = (Window) output->window;
+
ret = gl_renderer->output_create(&output->base,
(EGLNativeWindowType) output->window,
+ &xid,
gl_renderer->opaque_attribs,
NULL);
if (ret < 0)
diff --git a/src/gl-renderer.c b/src/gl-renderer.c
index e598d1e..d4e8f1e 100644
--- a/src/gl-renderer.c
+++ b/src/gl-renderer.c
@@ -140,6 +140,10 @@
PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC swap_buffers_with_damage;
#endif
+#ifdef EGL_EXT_platform_base
+ PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window;
+#endif
+
int has_unpack_subimage;
PFNEGLBINDWAYLANDDISPLAYWL bind_display;
@@ -1974,7 +1978,8 @@
static int
gl_renderer_output_create(struct weston_output *output,
- EGLNativeWindowType window,
+ EGLNativeWindowType window_for_legacy,
+ void *window_for_platform,
const EGLint *attribs,
const EGLint *visual_id)
{
@@ -2001,10 +2006,19 @@
if (go == NULL)
return -1;
- go->egl_surface =
- eglCreateWindowSurface(gr->egl_display,
- egl_config,
- window, NULL);
+#ifdef EGL_EXT_platform_base
+ if (gr->create_platform_window) {
+ go->egl_surface =
+ gr->create_platform_window(gr->egl_display,
+ egl_config,
+ window_for_platform,
+ NULL);
+ } else
+#endif
+ go->egl_surface =
+ eglCreateWindowSurface(gr->egl_display,
+ egl_config,
+ window_for_legacy, NULL);
if (go->egl_surface == EGL_NO_SURFACE) {
weston_log("failed to create egl surface\n");
@@ -2124,6 +2138,21 @@
"supported. Performance could be affected.\n");
#endif
+#ifdef EGL_EXT_platform_base
+ extensions =
+ (const char *) eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
+ if (!extensions) {
+ weston_log("Retrieving EGL client extension string failed.\n");
+ return -1;
+ }
+
+ if (strstr(extensions, "EGL_EXT_platform_base"))
+ gr->create_platform_window =
+ (void *) eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT");
+ else
+ weston_log("warning: EGL_EXT_platform_base not supported.\n");
+#endif
+
#ifdef EGL_MESA_configless_context
if (strstr(extensions, "EGL_MESA_configless_context"))
gr->has_configless_context = 1;
diff --git a/src/gl-renderer.h b/src/gl-renderer.h
index bbf0ac6..c5550d1 100644
--- a/src/gl-renderer.h
+++ b/src/gl-renderer.h
@@ -62,7 +62,8 @@
EGLDisplay (*display)(struct weston_compositor *ec);
int (*output_create)(struct weston_output *output,
- EGLNativeWindowType window,
+ EGLNativeWindowType window_for_legacy,
+ void *window_for_platform,
const EGLint *attribs,
const EGLint *visual_id);