commit 51a7ae5f89e9504f49bd98c7cd714e66c2a35580
author Jonny Lamb <jonny.lamb@collabora.co.uk> Fri Mar 20 15:26:51 2015 +0100
committer Bryce Harrington <bryce@osg.samsung.com> Fri Mar 20 13:56:38 2015 -0700
tree 06acb4561ed8bbfc512eee565907e1f3b0ffdb3c
parent 70eba3fbde63721fab950e12f848b92d652a85ad

clients & tests: use eglGetPlatformDisplayEXT when supported

Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>

clients/nested-client.c

diff --git a/clients/nested-client.c b/clients/nested-client.c
index 7f237e6..96cf1c8 100644
--- a/clients/nested-client.c
+++ b/clients/nested-client.c
@@ -277,7 +277,9 @@
 	/* get globals */
 	wl_display_roundtrip(client->display);
 
-	client->egl_display = eglGetDisplay(client->display);
+	client->egl_display =
+		weston_platform_get_egl_display(EGL_PLATFORM_WAYLAND_KHR,
+						client->display, NULL);
 	if (client->egl_display == NULL)
 		return NULL;
 

clients/simple-egl.c

diff --git a/clients/simple-egl.c b/clients/simple-egl.c
index 3040caa..33e02e7 100644
--- a/clients/simple-egl.c
+++ b/clients/simple-egl.c
@@ -46,6 +46,8 @@
 #include "protocol/ivi-application-client-protocol.h"
 #define IVI_SURFACE_ID 9000
 
+#include "../shared/platform.h"
+
 #ifndef EGL_EXT_swap_buffers_with_damage
 #define EGL_EXT_swap_buffers_with_damage 1
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC)(EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
@@ -151,7 +153,9 @@
 	if (window->opaque || window->buffer_size == 16)
 		config_attribs[9] = 0;
 
-	display->egl.dpy = eglGetDisplay(display->display);
+	display->egl.dpy =
+		weston_platform_get_egl_display(EGL_PLATFORM_WAYLAND_KHR,
+						display->display, NULL);
 	assert(display->egl.dpy);
 
 	ret = eglInitialize(display->egl.dpy, &major, &minor);

clients/subsurfaces.c

diff --git a/clients/subsurfaces.c b/clients/subsurfaces.c
index fcbe496..5b8fd8d 100644
--- a/clients/subsurfaces.c
+++ b/clients/subsurfaces.c
@@ -38,6 +38,7 @@
 #include <wayland-egl.h>
 #include <GLES2/gl2.h>
 #include <EGL/egl.h>
+#include <EGL/eglext.h>
 
 #include "window.h"
 
@@ -215,7 +216,9 @@
 	egl = calloc(1, sizeof *egl);
 	assert(egl);
 
-	egl->dpy = eglGetDisplay(display);
+	egl->dpy =
+		weston_platform_get_egl_display(EGL_PLATFORM_WAYLAND_KHR,
+						display, NULL);
 	assert(egl->dpy);
 
 	ret = eglInitialize(egl->dpy, &major, &minor);

clients/window.c

diff --git a/clients/window.c b/clients/window.c
index b84d3b2..2858281 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -5392,7 +5392,10 @@
 	EGLint api = EGL_OPENGL_API;
 #endif
 
-	d->dpy = eglGetDisplay(d->display);
+	d->dpy =
+		weston_platform_get_egl_display(EGL_PLATFORM_WAYLAND_KHR,
+						d->display, NULL);
+
 	if (!eglInitialize(d->dpy, &major, &minor)) {
 		fprintf(stderr, "failed to initialize EGL\n");
 		return -1;

clients/window.h

diff --git a/clients/window.h b/clients/window.h
index 5247f19..0686c3f 100644
--- a/clients/window.h
+++ b/clients/window.h
@@ -30,6 +30,7 @@
 #include <cairo.h>
 #include "../shared/config-parser.h"
 #include "../shared/zalloc.h"
+#include "../shared/platform.h"
 
 #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])