From: Emil Velikov Date: Thu, 28 Sep 2017 17:03:58 +0000 (+0100) Subject: wayland-egl: rename wayland-egl-{priv,backend}.h X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=198af27c679c0cabbb8747dd23fed5bd68bfdee2;p=mesa.git wayland-egl: rename wayland-egl-{priv,backend}.h In preparation to lifting the whole thing out as a separate library. Signed-off-by: Emil Velikov Reviewed-by: Daniel Stone Reviewed-by: Miguel A. Vico --- diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index c70a84bb917..e3bdbb55f5d 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -44,7 +44,7 @@ #ifdef HAVE_WAYLAND_PLATFORM #include -#include "wayland-egl-priv.h" +#include "wayland-egl-backend.h" /* forward declarations of protocol elements */ struct zwp_linux_dmabuf_v1; #endif diff --git a/src/egl/wayland/wayland-egl/Makefile.am b/src/egl/wayland/wayland-egl/Makefile.am index 34394a17f0e..7dde9552f33 100644 --- a/src/egl/wayland/wayland-egl/Makefile.am +++ b/src/egl/wayland/wayland-egl/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = $(DEFINES) \ $(WAYLAND_CLIENT_CFLAGS) lib_LTLIBRARIES = libwayland-egl.la -noinst_HEADERS = wayland-egl-priv.h +noinst_HEADERS = wayland-egl-backend.h libwayland_egl_la_SOURCES = wayland-egl.c libwayland_egl_la_LDFLAGS = \ -no-undefined \ diff --git a/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c b/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c index 4ea38542a38..66688642c7b 100644 --- a/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c +++ b/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c @@ -23,7 +23,7 @@ #include // offsetof #include // printf -#include "wayland-egl-priv.h" // Current struct wl_egl_window implementation +#include "wayland-egl-backend.h" // Current struct wl_egl_window implementation /* * Following are previous implementations of wl_egl_window. @@ -100,7 +100,7 @@ struct wl_egl_window_v3 { /* This program checks we keep a backwards-compatible struct wl_egl_window - * definition whenever it is modified in wayland-egl-priv.h. + * definition whenever it is modified in wayland-egl-backend.h. * * The previous definition should be added above as a new struct * wl_egl_window_vN, and the appropriate checks should be added below diff --git a/src/egl/wayland/wayland-egl/wayland-egl-backend.h b/src/egl/wayland/wayland-egl/wayland-egl-backend.h new file mode 100644 index 00000000000..3b59908cc16 --- /dev/null +++ b/src/egl/wayland/wayland-egl/wayland-egl-backend.h @@ -0,0 +1,68 @@ +/* + * Copyright © 2011 Benjamin Franzke + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Authors: + * Benjamin Franzke + */ + +#ifndef _WAYLAND_EGL_PRIV_H +#define _WAYLAND_EGL_PRIV_H + +/* GCC visibility */ +#if defined(__GNUC__) +#define WL_EGL_EXPORT __attribute__ ((visibility("default"))) +#else +#define WL_EGL_EXPORT +#endif + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define WL_EGL_WINDOW_VERSION 3 + +struct wl_egl_window { + const intptr_t version; + + int width; + int height; + int dx; + int dy; + + int attached_width; + int attached_height; + + void *private; + void (*resize_callback)(struct wl_egl_window *, void *); + void (*destroy_window_callback)(void *); + + struct wl_surface *surface; +}; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/egl/wayland/wayland-egl/wayland-egl-priv.h b/src/egl/wayland/wayland-egl/wayland-egl-priv.h deleted file mode 100644 index 3b59908cc16..00000000000 --- a/src/egl/wayland/wayland-egl/wayland-egl-priv.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright © 2011 Benjamin Franzke - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Authors: - * Benjamin Franzke - */ - -#ifndef _WAYLAND_EGL_PRIV_H -#define _WAYLAND_EGL_PRIV_H - -/* GCC visibility */ -#if defined(__GNUC__) -#define WL_EGL_EXPORT __attribute__ ((visibility("default"))) -#else -#define WL_EGL_EXPORT -#endif - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#define WL_EGL_WINDOW_VERSION 3 - -struct wl_egl_window { - const intptr_t version; - - int width; - int height; - int dx; - int dy; - - int attached_width; - int attached_height; - - void *private; - void (*resize_callback)(struct wl_egl_window *, void *); - void (*destroy_window_callback)(void *); - - struct wl_surface *surface; -}; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/egl/wayland/wayland-egl/wayland-egl.c b/src/egl/wayland/wayland-egl/wayland-egl.c index f16324c9f61..575f94db498 100644 --- a/src/egl/wayland/wayland-egl/wayland-egl.c +++ b/src/egl/wayland/wayland-egl/wayland-egl.c @@ -32,7 +32,7 @@ #include #include "wayland-egl.h" -#include "wayland-egl-priv.h" +#include "wayland-egl-backend.h" WL_EGL_EXPORT void wl_egl_window_resize(struct wl_egl_window *egl_window,