From 91591c01a542a6a5ad036db4d3ba453439ec9e99 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Fri, 4 Mar 2011 17:29:17 +0100 Subject: [PATCH] Add the DRM protocol files This interface was removed from Wayland, and is now the responsibility of the EGL implementation. --- src/3rdparty/wayland/wayland-drm-client-protocol.h | 135 +++++++++++++++++++++ src/3rdparty/wayland/wayland-drm-protocol.c | 43 +++++++ src/3rdparty/wayland/wayland-drm-server-protocol.h | 62 ++++++++++ 3 files changed, 240 insertions(+) create mode 100644 src/3rdparty/wayland/wayland-drm-client-protocol.h create mode 100644 src/3rdparty/wayland/wayland-drm-protocol.c create mode 100644 src/3rdparty/wayland/wayland-drm-server-protocol.h diff --git a/src/3rdparty/wayland/wayland-drm-client-protocol.h b/src/3rdparty/wayland/wayland-drm-client-protocol.h new file mode 100644 index 0000000..66ab7ba --- /dev/null +++ b/src/3rdparty/wayland/wayland-drm-client-protocol.h @@ -0,0 +1,135 @@ +/* + * Copyright © 2010 Kristian Høgsberg + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + + +#ifndef DRM_CLIENT_PROTOCOL_H +#define DRM_CLIENT_PROTOCOL_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include "wayland-util.h" + +struct wl_client; + +struct wl_drm; + +struct wl_proxy; + +extern void +wl_proxy_marshal(struct wl_proxy *p, uint32_t opcode, ...); +extern struct wl_proxy * +wl_proxy_create(struct wl_proxy *factory, + const struct wl_interface *interface); +extern struct wl_proxy * +wl_proxy_create_for_id(struct wl_display *display, + const struct wl_interface *interface, uint32_t id); +extern void +wl_proxy_destroy(struct wl_proxy *proxy); + +extern int +wl_proxy_add_listener(struct wl_proxy *proxy, + void (**implementation)(void), void *data); + +extern void +wl_proxy_set_user_data(struct wl_proxy *proxy, void *user_data); + +extern void * +wl_proxy_get_user_data(struct wl_proxy *proxy); + +extern const struct wl_interface wl_drm_interface; + +struct wl_drm_listener { + void (*device)(void *data, + struct wl_drm *drm, + const char *name); + void (*authenticated)(void *data, + struct wl_drm *drm); +}; + +static inline int +wl_drm_add_listener(struct wl_drm *drm, + const struct wl_drm_listener *listener, void *data) +{ + return wl_proxy_add_listener((struct wl_proxy *) drm, + (void (**)(void)) listener, data); +} + +#define WL_DRM_AUTHENTICATE 0 +#define WL_DRM_CREATE_BUFFER 1 + +static inline struct wl_drm * +wl_drm_create(struct wl_display *display, uint32_t id) +{ + return (struct wl_drm *) + wl_proxy_create_for_id(display, &wl_drm_interface, id); +} + +static inline void +wl_drm_set_user_data(struct wl_drm *drm, void *user_data) +{ + wl_proxy_set_user_data((struct wl_proxy *) drm, user_data); +} + +static inline void * +wl_drm_get_user_data(struct wl_drm *drm) +{ + return wl_proxy_get_user_data((struct wl_proxy *) drm); +} + +static inline void +wl_drm_destroy(struct wl_drm *drm) +{ + wl_proxy_destroy((struct wl_proxy *) drm); +} + +static inline void +wl_drm_authenticate(struct wl_drm *drm, uint32_t id) +{ + wl_proxy_marshal((struct wl_proxy *) drm, + WL_DRM_AUTHENTICATE, id); +} + +static inline struct wl_buffer * +wl_drm_create_buffer(struct wl_drm *drm, uint32_t name, int width, int height, uint32_t stride, struct wl_visual *visual) +{ + struct wl_proxy *id; + + id = wl_proxy_create((struct wl_proxy *) drm, + &wl_buffer_interface); + if (!id) + return NULL; + + wl_proxy_marshal((struct wl_proxy *) drm, + WL_DRM_CREATE_BUFFER, id, name, width, height, stride, visual); + + return (struct wl_buffer *) id; +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/3rdparty/wayland/wayland-drm-protocol.c b/src/3rdparty/wayland/wayland-drm-protocol.c new file mode 100644 index 0000000..f69318e --- /dev/null +++ b/src/3rdparty/wayland/wayland-drm-protocol.c @@ -0,0 +1,43 @@ +/* + * Copyright © 2010 Kristian Høgsberg + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + + +#include +#include +#include "wayland-util.h" + +static const struct wl_message drm_requests[] = { + { "authenticate", "u" }, + { "create_buffer", "nuiiuo" }, +}; + +static const struct wl_message drm_events[] = { + { "device", "s" }, + { "authenticated", "" }, +}; + +WL_EXPORT const struct wl_interface wl_drm_interface = { + "drm", 1, + ARRAY_LENGTH(drm_requests), drm_requests, + ARRAY_LENGTH(drm_events), drm_events, +}; + diff --git a/src/3rdparty/wayland/wayland-drm-server-protocol.h b/src/3rdparty/wayland/wayland-drm-server-protocol.h new file mode 100644 index 0000000..1b9f117 --- /dev/null +++ b/src/3rdparty/wayland/wayland-drm-server-protocol.h @@ -0,0 +1,62 @@ +/* + * Copyright © 2010 Kristian Høgsberg + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + + +#ifndef DRM_SERVER_PROTOCOL_H +#define DRM_SERVER_PROTOCOL_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include "wayland-util.h" + +struct wl_client; + +struct wl_drm; + +extern const struct wl_interface wl_drm_interface; + +struct wl_drm_interface { + void (*authenticate)(struct wl_client *client, + struct wl_drm *drm, + uint32_t id); + void (*create_buffer)(struct wl_client *client, + struct wl_drm *drm, + uint32_t id, + uint32_t name, + int width, + int height, + uint32_t stride, + struct wl_visual *visual); +}; + +#define WL_DRM_DEVICE 0 +#define WL_DRM_AUTHENTICATED 1 + +#ifdef __cplusplus +} +#endif + +#endif -- 2.7.4