This reverts commit 9fa60983b5799be62b9d88a4059f4d0038d7c80d. The commit preserves the ABI, although breaks the API. This is fine for most cases - building up-to date components, or shipping binary-only drivers.
Yet it breaks when using old, released, Mesa alongside new wayland-egl. A simpler and compatible way to handle the C++ inclusion of the header is coming in shortly. But for now revert this change. https://bugs.freedesktop.org/show_bug.cgi?id=105103 Cc: Daniel Stone <dani...@collabora.com> Cc: Arnaud Vrac <raw...@gmail.com> Cc: Miguel A . Vico <mvicom...@nvidia.com> --- egl/wayland-egl-abi-check.c | 6 +++--- egl/wayland-egl-backend.h | 2 +- egl/wayland-egl.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/egl/wayland-egl-abi-check.c b/egl/wayland-egl-abi-check.c index faa6b57..62c51a2 100644 --- a/egl/wayland-egl-abi-check.c +++ b/egl/wayland-egl-abi-check.c @@ -91,7 +91,7 @@ struct wl_egl_window_v3 { int attached_width; int attached_height; - void *driver_private; + void *private; void (*resize_callback)(struct wl_egl_window *, void *); void (*destroy_window_callback)(void *); @@ -208,7 +208,7 @@ int main(int argc, char **argv) CHECK_MEMBER (_v2, _v3, dy); CHECK_MEMBER (_v2, _v3, attached_width); CHECK_MEMBER (_v2, _v3, attached_height); - CHECK_RENAMED_MEMBER(_v2, _v3, private, driver_private); + CHECK_MEMBER (_v2, _v3, private); CHECK_MEMBER (_v2, _v3, resize_callback); CHECK_MEMBER (_v2, _v3, destroy_window_callback); @@ -223,7 +223,7 @@ int main(int argc, char **argv) CHECK_MEMBER_CURRENT(_v3, dy); CHECK_MEMBER_CURRENT(_v3, attached_width); CHECK_MEMBER_CURRENT(_v3, attached_height); - CHECK_MEMBER_CURRENT(_v3, driver_private); + CHECK_MEMBER_CURRENT(_v3, private); CHECK_MEMBER_CURRENT(_v3, resize_callback); CHECK_MEMBER_CURRENT(_v3, destroy_window_callback); CHECK_MEMBER_CURRENT(_v3, surface); diff --git a/egl/wayland-egl-backend.h b/egl/wayland-egl-backend.h index 869c86f..3c23a56 100644 --- a/egl/wayland-egl-backend.h +++ b/egl/wayland-egl-backend.h @@ -53,7 +53,7 @@ struct wl_egl_window { int attached_width; int attached_height; - void *driver_private; + void *private; void (*resize_callback)(struct wl_egl_window *, void *); void (*destroy_window_callback)(void *); diff --git a/egl/wayland-egl.c b/egl/wayland-egl.c index a60f899..02ac04e 100644 --- a/egl/wayland-egl.c +++ b/egl/wayland-egl.c @@ -49,7 +49,7 @@ wl_egl_window_resize(struct wl_egl_window *egl_window, egl_window->dy = dy; if (egl_window->resize_callback) - egl_window->resize_callback(egl_window, egl_window->driver_private); + egl_window->resize_callback(egl_window, egl_window->private); } WL_EXPORT struct wl_egl_window * @@ -89,7 +89,7 @@ WL_EXPORT void wl_egl_window_destroy(struct wl_egl_window *egl_window) { if (egl_window->destroy_window_callback) - egl_window->destroy_window_callback(egl_window->driver_private); + egl_window->destroy_window_callback(egl_window->private); free(egl_window); } -- 2.16.0 _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel