From bfb8e61381794c7d91a90e71f0f1a6e9039159a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Mon, 7 Feb 2011 10:30:38 -0500
Subject: [PATCH] Follow wayland-egl renames

---
 clients/simple-client.c | 10 +++++-----
 clients/window.c        | 17 ++++++++---------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/clients/simple-client.c b/clients/simple-client.c
index 048f846b..9cc37d13 100644
--- a/clients/simple-client.c
+++ b/clients/simple-client.c
@@ -197,10 +197,10 @@ create_surface(struct window *window)
 	window->surface = wl_compositor_create_surface(display->compositor);
 	visual = wl_display_get_premultiplied_argb_visual(display->display);
 	window->native =
-		wl_egl_native_window_create(window->surface,
-					    window->geometry.width,
-					    window->geometry.height,
-					    visual);
+		wl_egl_window_create(window->surface,
+				     window->geometry.width,
+				     window->geometry.height,
+				     visual);
 	window->egl_surface =
 		eglCreateWindowSurface(display->egl.dpy,
 				       display->egl.conf,
@@ -308,7 +308,7 @@ main(int argc, char **argv)
 	wl_display_add_global_listener(display.display,
 				       display_handle_global, &display);
 
-	display.native = wl_egl_native_display_create(display.display);
+	display.native = wl_egl_display_create(display.display);
 
 	init_egl(&display);
 	create_surface(&window);
diff --git a/clients/window.c b/clients/window.c
index 37afcc5f..b802518f 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -206,7 +206,7 @@ egl_image_surface_data_destroy(void *p)
 
 	eglDestroyImageKHR(d->dpy, data->image);
 	wl_buffer_destroy(data->data.buffer);
-	wl_egl_native_pixmap_destroy(data->pixmap);
+	wl_egl_pixmap_destroy(data->pixmap);
 	free(p);
 }
 
@@ -237,10 +237,10 @@ display_create_egl_image_surface(struct display *display,
 	data->display = display;
 
 	visual = wl_display_get_premultiplied_argb_visual(display->display);
-	data->pixmap =wl_egl_native_pixmap_create(display->native_dpy,
-						   rectangle->width,
-						   rectangle->height,
-						   visual, 0);
+	data->pixmap =wl_egl_pixmap_create(display->native_dpy,
+					   rectangle->width,
+					   rectangle->height,
+					   visual, 0);
 	if (data->pixmap == NULL) {
 		free(data);
 		return NULL;
@@ -250,14 +250,13 @@ display_create_egl_image_surface(struct display *display,
 					EGL_NATIVE_PIXMAP_KHR,
 					(EGLClientBuffer) data->pixmap, NULL);
 	if (data->image == EGL_NO_IMAGE_KHR) {
-		wl_egl_native_pixmap_destroy(data->pixmap);
+		wl_egl_pixmap_destroy(data->pixmap);
 		free(data);
 		return NULL;
 	}
 
 	data->data.buffer =
-		wl_egl_native_pixmap_create_buffer(display->native_dpy,
-						   data->pixmap);
+		wl_egl_pixmap_create_buffer(display->native_dpy, data->pixmap);
 
 	cairo_device_acquire(display->device);
 	glGenTextures(1, &data->texture);
@@ -1673,7 +1672,7 @@ display_create(int *argc, char **argv[], const GOptionEntry *option_entries)
 	wl_display_add_global_listener(d->display,
 				       display_handle_global, d);
 
-	d->native_dpy = wl_egl_native_display_create(d->display);
+	d->native_dpy = wl_egl_display_create(d->display);
 
 	/* Process connection events. */
 	wl_display_iterate(d->display, WL_DISPLAY_READABLE);