s/egl_native_/egl_/g

3 files changed, 29 insertions, 35 deletions

diff --git a/egl-wayland-pixmap-image.c b/egl-wayland-pixmap-image.c
index ff5764b..993aa00 100644
--- a/egl-wayland-pixmap-image.c
+++ b/egl-wayland-pixmap-image.c
@@ -201,10 +201,10 @@ create_surface(struct window *window)
 
 	visual = wl_display_get_premultiplied_argb_visual(display->display);
 	window->surface.egl_pixmap =
-		wl_egl_native_pixmap_create(display->egl_display,
-					    window->geometry.width,
-					    window->geometry.height,
-					    visual, 0);
+		wl_egl_pixmap_create(display->egl_display,
+				     window->geometry.width,
+				     window->geometry.height,
+				     visual, 0);
 	window->surface.buffer = NULL;
 
 	wl_surface_map_toplevel(window->surface.surface);
@@ -276,12 +276,12 @@ redraw(void *data, uint32_t time)
 	glDisableVertexAttribArray(window->gl.col);
 
 	if (!window->surface.buffer)
-		window->surface.buffer = wl_egl_native_pixmap_create_buffer(
+		window->surface.buffer = wl_egl_pixmap_create_buffer(
 				window->display->egl_display,
 				window->surface.egl_pixmap);
 
-	wl_egl_native_pixmap_flush(window->display->egl_display,
-				   window->surface.egl_pixmap);
+	wl_egl_pixmap_flush(window->display->egl_display,
+			    window->surface.egl_pixmap);
 	wl_surface_attach(window->surface.surface, window->surface.buffer,
 			  window->dx, window->dy);
 
@@ -332,10 +332,10 @@ handle_configure(void *data, struct wl_shell *shell,
 
 	visual = wl_display_get_premultiplied_argb_visual(d->display);
 	window->surface.egl_pixmap =
-		wl_egl_native_pixmap_create(d->egl_display,
-					    window->geometry.width,
-					    window->geometry.height,
-					    visual, 0);
+		wl_egl_pixmap_create(d->egl_display,
+				     window->geometry.width,
+				     window->geometry.height,
+				     visual, 0);
 
 	if (window->surface.buffer) {
 		wl_buffer_destroy(window->surface.buffer);
@@ -355,7 +355,7 @@ handle_configure(void *data, struct wl_shell *shell,
 				  GL_RENDERBUFFER, window->gl.color_rbo);
 
 	eglDestroyImageKHR(d->egl.dpy, old_egl_image);
-	wl_egl_native_pixmap_destroy(old_egl_pixmap);
+	wl_egl_pixmap_destroy(old_egl_pixmap);
 
 	glViewport(0, 0, window->geometry.width, window->geometry.height);
 }
@@ -404,7 +404,7 @@ main(int argc, char **argv)
 	display.display = wl_display_connect(NULL);
 	assert(display.display);
 
-	display.egl_display = wl_egl_native_display_create(display.display);
+	display.egl_display = wl_egl_display_create(display.display);
 	assert(display.egl_display);
 
 	wl_display_add_global_listener(display.display,
diff --git a/egl-wayland-pixmap-surface.c b/egl-wayland-pixmap-surface.c
index 8f939b1..1fd7da9 100644
--- a/egl-wayland-pixmap-surface.c
+++ b/egl-wayland-pixmap-surface.c
@@ -79,10 +79,10 @@ create_egl_surface(struct display *display, struct window *window)
 	visual = wl_display_get_premultiplied_argb_visual(display->display);
 
 	window->egl_pixmap =
-		wl_egl_native_pixmap_create(display->egl_display,
-					    window->width,
-					    window->height,
-					    visual, 0);
+		wl_egl_pixmap_create(display->egl_display,
+				     window->width,
+				     window->height,
+				     visual, 0);
 	window->buffer = NULL;
 
 	window->egl.surf =
@@ -133,7 +133,7 @@ redraw(void *data, uint32_t time)
 		start_time = time;
 
 	if (window->egl.surf == NULL) {
-		wl_egl_native_pixmap_destroy(window->egl_pixmap);
+		wl_egl_pixmap_destroy(window->egl_pixmap);
 		create_egl_surface(window->display, window);
 		glViewport(0, 0, window->width, window->height);
 	}
@@ -157,10 +157,9 @@ redraw(void *data, uint32_t time)
 	glPopMatrix();
 
 	if (!window->buffer)
-		window->buffer = wl_egl_native_pixmap_create_buffer(
+		window->buffer = wl_egl_pixmap_create_buffer(
 			window->display->egl_display, window->egl_pixmap);
-	wl_egl_native_pixmap_flush(window->display->egl_display,
-				   window->egl_pixmap);
+	wl_egl_pixmap_flush(window->display->egl_display, window->egl_pixmap);
 
 	//eglSwapBuffers(window->display->egl.dpy, window->egl.surf);
 	wl_surface_attach(window->surface, window->buffer,
@@ -216,25 +215,20 @@ handle_configure(void *data, struct wl_shell *shell,
 	if (edges & WINDOW_RESIZING_TOP)
 		dy = window->attached_height - height;
 
-	//wl_egl_surface_resize(window->egl_surface, width, height, dx, dy);
-	
 	if (window->buffer) {
 		wl_buffer_destroy(window->buffer);
 		window->buffer = NULL;
 	}
 
-
 	if (window->egl.surf) {
 		eglDestroySurface(d->egl.dpy, window->egl.surf);
 		window->egl.surf = NULL;
 	}
 	
-
 	window->dx = dx;
 	window->dy = dy;
 	window->width = width;
 	window->height = height;
-
 }
 
 static const struct wl_shell_listener wayland_shell_listener = {
@@ -278,7 +272,7 @@ main(int argc, char **argv)
 	display.display = wl_display_connect(NULL);
 	assert(display.display);
 
-	display.egl_display = wl_egl_native_display_create(display.display);
+	display.egl_display = wl_egl_display_create(display.display);
 	assert(display.egl_display);
 
 	wl_display_add_global_listener(display.display,
diff --git a/egl-wayland-window.c b/egl-wayland-window.c
index a726bc1..a051793 100644
--- a/egl-wayland-window.c
+++ b/egl-wayland-window.c
@@ -74,10 +74,10 @@ create_egl_window(struct display *display, struct window *window)
 	struct wl_visual *visual;	
 
 	visual = wl_display_get_premultiplied_argb_visual(display->display);
-	window->egl_window = wl_egl_native_window_create(window->surface,
-							 window->width,
-							 window->height,
-							 visual);
+	window->egl_window = wl_egl_window_create(window->surface,
+						  window->width,
+						  window->height,
+						  visual);
 
 	window->egl.surf =
 		eglCreateWindowSurface(display->egl.dpy, display->egl.conf,
@@ -175,8 +175,8 @@ handle_configure(void *data, struct wl_shell *shell,
 	int dy = 0;
 	int a_width, a_height;
 
-	wl_egl_native_window_get_attached_size(window->egl_window,
-					       &a_width, &a_height);
+	wl_egl_window_get_attached_size(window->egl_window,
+					&a_width, &a_height);
 
 	if (edges & WINDOW_RESIZING_LEFT)
 		dx = a_width - width;
@@ -184,7 +184,7 @@ handle_configure(void *data, struct wl_shell *shell,
 	if (edges & WINDOW_RESIZING_TOP)
 		dy = a_height - height;
 
-	wl_egl_native_window_resize(window->egl_window, width, height, dx, dy);
+	wl_egl_window_resize(window->egl_window, width, height, dx, dy);
 
 	window->width = width;
 	window->height = height;
@@ -233,7 +233,7 @@ main(int argc, char **argv)
 	display.display = wl_display_connect(NULL);
 	assert(display.display);
 
-	display.egl_display = wl_egl_native_display_create(display.display);
+	display.egl_display = wl_egl_display_create(display.display);
 	assert(display.egl_display);
 
 	wl_display_add_global_listener(display.display,