platform: rename create_egl_window to create_egl_surface
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
committed by
Pekka Paalanen
parent
759fbf4d0f
commit
abff883d2c
@@ -309,8 +309,8 @@ nested_client_create(void)
|
|||||||
client->native = wl_egl_window_create(client->surface,
|
client->native = wl_egl_window_create(client->surface,
|
||||||
client->width, client->height);
|
client->width, client->height);
|
||||||
|
|
||||||
client->egl_surface = weston_platform_create_egl_window (client->egl_display,
|
client->egl_surface = weston_platform_create_egl_surface(client->egl_display,
|
||||||
client->egl_config,
|
nclient->egl_config,
|
||||||
client->native, NULL);
|
client->native, NULL);
|
||||||
|
|
||||||
eglMakeCurrent(client->egl_display, client->egl_surface,
|
eglMakeCurrent(client->egl_display, client->egl_surface,
|
||||||
|
|||||||
@@ -386,9 +386,9 @@ create_surface(struct window *window)
|
|||||||
window->geometry.width,
|
window->geometry.width,
|
||||||
window->geometry.height);
|
window->geometry.height);
|
||||||
window->egl_surface =
|
window->egl_surface =
|
||||||
weston_platform_create_egl_window(display->egl.dpy,
|
weston_platform_create_egl_surface(display->egl.dpy,
|
||||||
display->egl.conf,
|
display->egl.conf,
|
||||||
window->native, NULL);
|
window->native, NULL);
|
||||||
|
|
||||||
|
|
||||||
if (display->shell) {
|
if (display->shell) {
|
||||||
|
|||||||
@@ -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->wl_surface = widget_get_wl_surface(tri->widget);
|
||||||
tri->egl_window = wl_egl_window_create(tri->wl_surface, width, height);
|
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_surface = weston_platform_create_egl_surface(tri->egl->dpy,
|
||||||
tri->egl->conf,
|
tri->egl->conf,
|
||||||
tri->egl_window, NULL);
|
tri->egl_window, NULL);
|
||||||
|
|
||||||
ret = eglMakeCurrent(tri->egl->dpy, tri->egl_surface,
|
ret = eglMakeCurrent(tri->egl->dpy, tri->egl_surface,
|
||||||
tri->egl_surface, tri->egl->ctx);
|
tri->egl_surface, tri->egl->ctx);
|
||||||
|
|||||||
+3
-3
@@ -641,9 +641,9 @@ egl_window_surface_create(struct display *display,
|
|||||||
rectangle->height);
|
rectangle->height);
|
||||||
|
|
||||||
surface->egl_surface =
|
surface->egl_surface =
|
||||||
weston_platform_create_egl_window(display->dpy,
|
weston_platform_create_egl_surface(display->dpy,
|
||||||
display->argb_config,
|
display->argb_config,
|
||||||
surface->egl_window, NULL);
|
surface->egl_window, NULL);
|
||||||
|
|
||||||
surface->cairo_surface =
|
surface->cairo_surface =
|
||||||
cairo_gl_surface_create_for_egl(display->argb_device,
|
cairo_gl_surface_create_for_egl(display->argb_device,
|
||||||
|
|||||||
+6
-6
@@ -77,9 +77,9 @@ weston_platform_get_egl_display(EGLenum platform, void *native_display,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline EGLSurface
|
static inline EGLSurface
|
||||||
weston_platform_create_egl_window(EGLDisplay dpy, EGLConfig config,
|
weston_platform_create_egl_surface(EGLDisplay dpy, EGLConfig config,
|
||||||
void *native_window,
|
void *native_window,
|
||||||
const EGLint *attrib_list)
|
const EGLint *attrib_list)
|
||||||
{
|
{
|
||||||
static PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC
|
static PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC
|
||||||
create_platform_window = NULL;
|
create_platform_window = NULL;
|
||||||
@@ -109,9 +109,9 @@ weston_platform_get_egl_display(void *platform, void *native_display,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline void *
|
static inline void *
|
||||||
weston_platform_create_egl_window(void *dpy, void *config,
|
weston_platform_create_egl_surface(void *dpy, void *config,
|
||||||
void *native_window,
|
void *native_window,
|
||||||
const int *attrib_list)
|
const int *attrib_list)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -95,9 +95,9 @@ init_egl(struct test_data *test_data)
|
|||||||
surface->width,
|
surface->width,
|
||||||
surface->height);
|
surface->height);
|
||||||
test_data->egl_surface =
|
test_data->egl_surface =
|
||||||
weston_platform_create_egl_window(test_data->egl_dpy,
|
weston_platform_create_egl_surface(test_data->egl_dpy,
|
||||||
test_data->egl_conf,
|
test_data->egl_conf,
|
||||||
native_window, NULL);
|
native_window, NULL);
|
||||||
|
|
||||||
ret = eglMakeCurrent(test_data->egl_dpy, test_data->egl_surface,
|
ret = eglMakeCurrent(test_data->egl_dpy, test_data->egl_surface,
|
||||||
test_data->egl_surface, test_data->egl_ctx);
|
test_data->egl_surface, test_data->egl_ctx);
|
||||||
|
|||||||
Reference in New Issue
Block a user