wayland-egl: Rename wl_egl_<action>_<object> to wl_egl_<object>_<action>

2 files changed, 26 insertions, 33 deletions

diff --git a/src/egl/wayland/wayland-egl.c b/src/egl/wayland/wayland-egl.c
index d85f9459a8..9dfc54a2c8 100644
--- a/src/egl/wayland/wayland-egl.c
+++ b/src/egl/wayland/wayland-egl.c
@@ -26,7 +26,6 @@ drm_handle_device(void *data, struct wl_drm *drm, const char *device)
 	egl_display->device_name = strdup(device);
 
 	egl_display->fd = open(egl_display->device_name, O_RDWR);
-	printf("opened fd: %d\n", egl_display->fd);
 
 	if (egl_display->fd == -1) {
 		fprintf(stderr, "wayland-egl: could not open %s (%s)",
@@ -95,7 +94,7 @@ get_flush_address() {
 }
 
 WL_EGL_EXPORT struct wl_egl_display *
-wl_egl_create_native_display(struct wl_display *display)
+wl_egl_native_display_create(struct wl_display *display)
 {
 	struct wl_egl_display *egl_display;
 
@@ -117,7 +116,7 @@ wl_egl_create_native_display(struct wl_display *display)
 }
 
 WL_EGL_EXPORT void
-wl_egl_destroy_native_display(struct wl_egl_display *egl_display)
+wl_egl_native_display_destroy(struct wl_egl_display *egl_display)
 {
 
 	free(egl_display->device_name);
@@ -129,9 +128,9 @@ wl_egl_destroy_native_display(struct wl_egl_display *egl_display)
 }
 
 WL_EGL_EXPORT void
-wl_egl_surface_resize(struct wl_egl_surface *egl_surface,
-		      int width, int height,
-		      int dx, int dy)
+wl_egl_native_surface_resize(struct wl_egl_surface *egl_surface,
+			     int width, int height,
+			     int dx, int dy)
 {
 	egl_surface->width  = width;
 	egl_surface->height = height;
@@ -140,7 +139,7 @@ wl_egl_surface_resize(struct wl_egl_surface *egl_surface,
 }
 
 WL_EGL_EXPORT struct wl_egl_surface *
-wl_egl_create_native_surface(struct wl_surface *surface,
+wl_egl_native_surface_create(struct wl_surface *surface,
 			     int width, int height,
 			     struct wl_visual *visual)
 {
@@ -158,13 +157,13 @@ wl_egl_create_native_surface(struct wl_surface *surface,
 }
 
 WL_EGL_EXPORT void
-wl_egl_destroy_native_surface(struct wl_egl_surface *egl_surface)
+wl_egl_native_surface_destroy(struct wl_egl_surface *egl_surface)
 {
 	free(egl_surface);
 }
 
 WL_EGL_EXPORT struct wl_egl_pixmap *
-wl_egl_create_native_pixmap(struct wl_egl_display *egl_display,
+wl_egl_native_pixmap_create(struct wl_egl_display *egl_display,
 			    int width, int height,
 			    struct wl_visual *visual,
 			    uint32_t flags)
@@ -188,7 +187,7 @@ wl_egl_create_native_pixmap(struct wl_egl_display *egl_display,
 }
 
 WL_EGL_EXPORT void
-wl_egl_pixmap_destroy(struct wl_egl_pixmap *egl_pixmap)
+wl_egl_native_pixmap_destroy(struct wl_egl_pixmap *egl_pixmap)
 {
 	if (egl_pixmap->destroy)
 		egl_pixmap->destroy(egl_pixmap);
@@ -196,8 +195,8 @@ wl_egl_pixmap_destroy(struct wl_egl_pixmap *egl_pixmap)
 }
 
 WL_EGL_EXPORT struct wl_buffer *
-wl_egl_pixmap_flush(struct wl_egl_display *egl_display,
-		    struct wl_egl_pixmap *egl_pixmap)
+wl_egl_native_pixmap_create_buffer(struct wl_egl_display *egl_display,
+				   struct wl_egl_pixmap *egl_pixmap)
 {
 	if (egl_pixmap->name == 0)
 		return NULL;
@@ -208,8 +207,8 @@ wl_egl_pixmap_flush(struct wl_egl_display *egl_display,
 }
 
 WL_EGL_EXPORT void
-wl_egl_pixmap_flush(struct wl_egl_display *egl_display,
-		    struct wl_egl_pixmap *egl_pixmap)
+wl_egl_native_pixmap_flush(struct wl_egl_display *egl_display,
+			   struct wl_egl_pixmap *egl_pixmap)
 {
 	if (egl_display->glFlush)
 		egl_display->glFlush();
diff --git a/src/egl/wayland/wayland-egl.h b/src/egl/wayland/wayland-egl.h
index 53269e5059..411e070a8c 100644
--- a/src/egl/wayland/wayland-egl.h
+++ b/src/egl/wayland/wayland-egl.h
@@ -12,45 +12,39 @@ struct wl_egl_surface;
 struct wl_egl_pixmap;
 
 struct wl_egl_display *
-wl_egl_create_native_display(struct wl_display *);
+wl_egl_native_display_create(struct wl_display *);
 
 void
-wl_egl_destroy_native_display(struct wl_egl_display *);
+wl_egl_native_display_create(struct wl_egl_display *);
 
 struct wl_egl_surface *
-wl_egl_create_native_surface(struct wl_surface *,
+wl_egl_native_surface_create(struct wl_surface *,
 			     int width, int height,
 			     struct wl_visual *);
 
 void
-wl_egl_destroy_native_surface(struct wl_egl_surface *);
+wl_egl_native_surface_destroy(struct wl_egl_surface *);
 
 void
-wl_egl_surface_resize(struct wl_egl_surface *,
-		      int width, int height,
-		      int dx, int dy);
+wl_egl_native_surface_resize(struct wl_egl_surface *,
+			     int width, int height,
+			     int dx, int dy);
 
 struct wl_egl_pixmap *
-wl_egl_create_native_pixmap(struct wl_egl_display *egl_display,
+wl_egl_native_pixmap_create(struct wl_egl_display *egl_display,
 			    int width, int height,
 			    struct wl_visual *visual,
 			    uint32_t flags);
 void
-wl_egl_pixmap_destroy(struct wl_egl_pixmap *egl_pixmap);
-
-void
-wl_egl_pixmap_attach(struct wl_egl_display *egl_display,
-		    struct wl_egl_pixmap *egl_pixmap,
-		    struct wl_surface *surface,
-		    int dx, int dy);
+wl_egl_native_pixmap_destroy(struct wl_egl_pixmap *egl_pixmap);
 
 struct wl_buffer *
-wl_egl_pixmap_create_buffer(struct wl_egl_display *egl_display,
-			    struct wl_egl_pixmap *egl_pixmap);
+wl_egl_native_pixmap_create_buffer(struct wl_egl_display *egl_display,
+				   struct wl_egl_pixmap *egl_pixmap);
 
 void
-wl_egl_pixmap_flush(struct wl_egl_display *egl_display,
-		    struct wl_egl_pixmap *egl_pixmap)
+wl_egl_native_pixmap_flush(struct wl_egl_display *egl_display,
+			   struct wl_egl_pixmap *egl_pixmap)
 
 #ifdef  __cplusplus
 }