Rename weston_compositor EGLDisplay member to egl_display
EGLDisplay is helpfully typedeffed as void *, which means that you won't
get conflicting-pointer-type warnings if you accidentally confuse it
with weston_compositor::wl_display. Rename it to make it more clear
which display you're dealing with, and also rename compositor-wayland's
parent.display member to parent.wl_display.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/compositor.c b/src/compositor.c
index ccca60d..053dfd1 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -668,7 +668,7 @@
wl_list_remove(&surface->buffer_destroy_listener.link);
if (surface->image != EGL_NO_IMAGE_KHR)
- compositor->destroy_image(compositor->display,
+ compositor->destroy_image(compositor->egl_display,
surface->image);
pixman_region32_fini(&surface->transform.boundingbox);
@@ -745,8 +745,8 @@
es->blend = 1;
} else {
if (es->image != EGL_NO_IMAGE_KHR)
- ec->destroy_image(ec->display, es->image);
- es->image = ec->create_image(ec->display, NULL,
+ ec->destroy_image(ec->egl_display, es->image);
+ es->image = ec->create_image(ec->egl_display, NULL,
EGL_WAYLAND_BUFFER_WL,
buffer, NULL);
@@ -2984,7 +2984,7 @@
wl_display_init_shm(display);
- log_egl_gl_info(ec->display);
+ log_egl_gl_info(ec->egl_display);
ec->image_target_texture_2d =
(void *) eglGetProcAddress("glEGLImageTargetTexture2DOES");
@@ -3017,7 +3017,7 @@
ec->has_unpack_subimage = 1;
extensions =
- (const char *) eglQueryString(ec->display, EGL_EXTENSIONS);
+ (const char *) eglQueryString(ec->egl_display, EGL_EXTENSIONS);
if (!extensions) {
weston_log("Retrieving EGL extension string failed.\n");
return -1;
@@ -3026,7 +3026,7 @@
if (strstr(extensions, "EGL_WL_bind_wayland_display"))
ec->has_bind_display = 1;
if (ec->has_bind_display)
- ec->bind_display(ec->display, ec->wl_display);
+ ec->bind_display(ec->egl_display, ec->wl_display);
wl_list_init(&ec->surface_list);
wl_list_init(&ec->layer_list);
@@ -3310,7 +3310,7 @@
wl_signal_emit(&ec->destroy_signal, ec);
if (ec->has_bind_display)
- ec->unbind_display(ec->display, display);
+ ec->unbind_display(ec->egl_display, display);
for (i = ARRAY_LENGTH(signals); i;)
wl_event_source_remove(signals[--i]);