1 diff --git a/Makefile.am b/Makefile.am
2 index 17c053e6..e0d3cb78 100644
5 @@ -609,9 +609,7 @@ demo_clients += weston-simple-egl
6 weston_simple_egl_SOURCES = clients/simple-egl.c
7 nodist_weston_simple_egl_SOURCES = \
8 protocol/xdg-shell-unstable-v6-protocol.c \
9 - protocol/xdg-shell-unstable-v6-client-protocol.h \
10 - protocol/ivi-application-protocol.c \
11 - protocol/ivi-application-client-protocol.h
12 + protocol/xdg-shell-unstable-v6-client-protocol.h
13 weston_simple_egl_CFLAGS = $(AM_CFLAGS) $(SIMPLE_EGL_CLIENT_CFLAGS)
14 weston_simple_egl_LDADD = $(SIMPLE_EGL_CLIENT_LIBS) -lm
16 diff --git a/clients/simple-egl.c b/clients/simple-egl.c
17 index a1e57aef..936e015e 100644
18 --- a/clients/simple-egl.c
19 +++ b/clients/simple-egl.c
21 #include "xdg-shell-unstable-v6-client-protocol.h"
22 #include <sys/types.h>
24 -#include "ivi-application-client-protocol.h"
25 -#define IVI_SURFACE_ID 9000
27 #include "shared/helpers.h"
28 #include "shared/platform.h"
29 @@ -74,7 +72,6 @@ struct display {
32 struct window *window;
33 - struct ivi_application *ivi_application;
35 PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC swap_buffers_with_damage;
37 @@ -97,7 +94,6 @@ struct window {
38 struct wl_surface *surface;
39 struct zxdg_surface_v6 *xdg_surface;
40 struct zxdg_toplevel_v6 *xdg_toplevel;
41 - struct ivi_surface *ivi_surface;
42 EGLSurface egl_surface;
43 struct wl_callback *callback;
44 int fullscreen, maximized, opaque, buffer_size, frame_sync, delay;
45 @@ -359,27 +355,22 @@ static const struct zxdg_toplevel_v6_listener xdg_toplevel_listener = {
49 -handle_ivi_surface_configure(void *data, struct ivi_surface *ivi_surface,
50 - int32_t width, int32_t height)
51 +create_surface(struct window *window)
53 - struct window *window = data;
55 - wl_egl_window_resize(window->native, width, height, 0, 0);
57 - window->geometry.width = width;
58 - window->geometry.height = height;
59 + struct display *display = window->display;
62 - if (!window->fullscreen)
63 - window->window_size = window->geometry;
65 + window->surface = wl_compositor_create_surface(display->compositor);
67 -static const struct ivi_surface_listener ivi_surface_listener = {
68 - handle_ivi_surface_configure,
71 + wl_egl_window_create(window->surface,
72 + window->geometry.width,
73 + window->geometry.height);
74 + window->egl_surface =
75 + weston_platform_create_egl_surface(display->egl.dpy,
77 + window->native, NULL);
80 -create_xdg_surface(struct window *window, struct display *display)
82 window->xdg_surface = zxdg_shell_v6_get_xdg_surface(display->shell,
84 zxdg_surface_v6_add_listener(window->xdg_surface,
85 @@ -394,50 +385,6 @@ create_xdg_surface(struct window *window, struct display *display)
87 window->wait_for_configure = true;
88 wl_surface_commit(window->surface);
92 -create_ivi_surface(struct window *window, struct display *display)
94 - uint32_t id_ivisurf = IVI_SURFACE_ID + (uint32_t)getpid();
95 - window->ivi_surface =
96 - ivi_application_surface_create(display->ivi_application,
97 - id_ivisurf, window->surface);
99 - if (window->ivi_surface == NULL) {
100 - fprintf(stderr, "Failed to create ivi_client_surface\n");
104 - ivi_surface_add_listener(window->ivi_surface,
105 - &ivi_surface_listener, window);
109 -create_surface(struct window *window)
111 - struct display *display = window->display;
114 - window->surface = wl_compositor_create_surface(display->compositor);
117 - wl_egl_window_create(window->surface,
118 - window->geometry.width,
119 - window->geometry.height);
120 - window->egl_surface =
121 - weston_platform_create_egl_surface(display->egl.dpy,
123 - window->native, NULL);
126 - if (display->shell) {
127 - create_xdg_surface(window, display);
128 - } else if (display->ivi_application ) {
129 - create_ivi_surface(window, display);
134 ret = eglMakeCurrent(window->display->egl.dpy, window->egl_surface,
135 window->egl_surface, window->display->egl.ctx);
136 @@ -469,8 +416,6 @@ destroy_surface(struct window *window)
137 zxdg_toplevel_v6_destroy(window->xdg_toplevel);
138 if (window->xdg_surface)
139 zxdg_surface_v6_destroy(window->xdg_surface);
140 - if (window->display->ivi_application)
141 - ivi_surface_destroy(window->ivi_surface);
142 wl_surface_destroy(window->surface);
144 if (window->callback)
145 @@ -825,10 +770,6 @@ registry_handle_global(void *data, struct wl_registry *registry,
146 fprintf(stderr, "unable to load default left pointer\n");
149 - } else if (strcmp(interface, "ivi_application") == 0) {
150 - d->ivi_application =
151 - wl_registry_bind(registry, name,
152 - &ivi_application_interface, 1);
156 @@ -943,9 +884,6 @@ main(int argc, char **argv)
158 zxdg_shell_v6_destroy(display.shell);
160 - if (display.ivi_application)
161 - ivi_application_destroy(display.ivi_application);
163 if (display.compositor)
164 wl_compositor_destroy(display.compositor);