summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2015-03-23 17:44:33 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2015-03-24 12:09:49 +0100
commitede04b6eca4ebc411dcd3c205e153f977976a851 (patch)
tree25f2bf9b330f88934a70c582917f2bd51c3d6412
parentaaa3517e7ddd23d7b5306767f6d5b028d2471cb6 (diff)
platform: rename create_egl_window to create_egl_surfaceegl-platform-misc
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-rw-r--r--clients/nested-client.c4
-rw-r--r--clients/simple-egl.c6
-rw-r--r--clients/subsurfaces.c6
-rw-r--r--clients/window.c6
-rw-r--r--shared/platform.h12
-rw-r--r--tests/buffer-count-test.c6
6 files changed, 20 insertions, 20 deletions
diff --git a/clients/nested-client.c b/clients/nested-client.c
index 200543c8..615f589f 100644
--- a/clients/nested-client.c
+++ b/clients/nested-client.c
@@ -309,8 +309,8 @@ nested_client_create(void)
client->native = wl_egl_window_create(client->surface,
client->width, client->height);
- client->egl_surface = weston_platform_create_egl_window (client->egl_display,
- client->egl_config,
+ client->egl_surface = weston_platform_create_egl_surface(client->egl_display,
+ nclient->egl_config,
client->native, NULL);
eglMakeCurrent(client->egl_display, client->egl_surface,
diff --git a/clients/simple-egl.c b/clients/simple-egl.c
index 1a0724d7..c6a95ebb 100644
--- a/clients/simple-egl.c
+++ b/clients/simple-egl.c
@@ -386,9 +386,9 @@ create_surface(struct window *window)
window->geometry.width,
window->geometry.height);
window->egl_surface =
- weston_platform_create_egl_window(display->egl.dpy,
- display->egl.conf,
- window->native, NULL);
+ weston_platform_create_egl_surface(display->egl.dpy,
+ display->egl.conf,
+ window->native, NULL);
if (display->shell) {
diff --git a/clients/subsurfaces.c b/clients/subsurfaces.c
index 130fe4cf..663e1e1d 100644
--- a/clients/subsurfaces.c
+++ b/clients/subsurfaces.c
@@ -422,9 +422,9 @@ triangle_create_egl_surface(struct triangle *tri, int width, int height)
tri->wl_surface = widget_get_wl_surface(tri->widget);
tri->egl_window = wl_egl_window_create(tri->wl_surface, width, height);
- tri->egl_surface = weston_platform_create_egl_window(tri->egl->dpy,
- tri->egl->conf,
- tri->egl_window, NULL);
+ tri->egl_surface = weston_platform_create_egl_surface(tri->egl->dpy,
+ tri->egl->conf,
+ tri->egl_window, NULL);
ret = eglMakeCurrent(tri->egl->dpy, tri->egl_surface,
tri->egl_surface, tri->egl->ctx);
diff --git a/clients/window.c b/clients/window.c
index 62b51852..67034623 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -641,9 +641,9 @@ egl_window_surface_create(struct display *display,
rectangle->height);
surface->egl_surface =
- weston_platform_create_egl_window(display->dpy,
- display->argb_config,
- surface->egl_window, NULL);
+ weston_platform_create_egl_surface(display->dpy,
+ display->argb_config,
+ surface->egl_window, NULL);
surface->cairo_surface =
cairo_gl_surface_create_for_egl(display->argb_device,
diff --git a/shared/platform.h b/shared/platform.h
index be6d8e6e..c0991885 100644
--- a/shared/platform.h
+++ b/shared/platform.h
@@ -77,9 +77,9 @@ weston_platform_get_egl_display(EGLenum platform, void *native_display,
}
static inline EGLSurface
-weston_platform_create_egl_window(EGLDisplay dpy, EGLConfig config,
- void *native_window,
- const EGLint *attrib_list)
+weston_platform_create_egl_surface(EGLDisplay dpy, EGLConfig config,
+ void *native_window,
+ const EGLint *attrib_list)
{
static PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC
create_platform_window = NULL;
@@ -109,9 +109,9 @@ weston_platform_get_egl_display(void *platform, void *native_display,
}
static inline void *
-weston_platform_create_egl_window(void *dpy, void *config,
- void *native_window,
- const int *attrib_list)
+weston_platform_create_egl_surface(void *dpy, void *config,
+ void *native_window,
+ const int *attrib_list)
{
return NULL;
}
diff --git a/tests/buffer-count-test.c b/tests/buffer-count-test.c
index 23cbc6ec..31d78c23 100644
--- a/tests/buffer-count-test.c
+++ b/tests/buffer-count-test.c
@@ -95,9 +95,9 @@ init_egl(struct test_data *test_data)
surface->width,
surface->height);
test_data->egl_surface =
- weston_platform_create_egl_window(test_data->egl_dpy,
- test_data->egl_conf,
- native_window, NULL);
+ weston_platform_create_egl_surface(test_data->egl_dpy,
+ test_data->egl_conf,
+ native_window, NULL);
ret = eglMakeCurrent(test_data->egl_dpy, test_data->egl_surface,
test_data->egl_surface, test_data->egl_ctx);