diff options
Diffstat (limited to 'src/egl/wayland/wayland-drm')
| -rw-r--r-- | src/egl/wayland/wayland-drm/Makefile | 3 | ||||
| -rw-r--r-- | src/egl/wayland/wayland-drm/protocol/wayland-drm.xml | 6 | ||||
| -rw-r--r-- | src/egl/wayland/wayland-drm/wayland-drm.c | 12 |
3 files changed, 11 insertions, 10 deletions
diff --git a/src/egl/wayland/wayland-drm/Makefile b/src/egl/wayland/wayland-drm/Makefile index c232769..789b020 100644 --- a/src/egl/wayland/wayland-drm/Makefile +++ b/src/egl/wayland/wayland-drm/Makefile @@ -12,7 +12,8 @@ wayland_drm_OBJECTS = $(wayland_drm_SOURCES:.c=.o) wayland_drm_INCLUDES = \ $(WAYLAND_CFLAGS) \ - -I$(TOP)/src/egl/main + -I$(TOP)/src/egl/main \ + -I$(TOP)/include # Generate protocol sources prefix=$(shell pkg-config --variable=prefix wayland-server) diff --git a/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml b/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml index 46725d8..cd5d191 100644 --- a/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml +++ b/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml @@ -2,7 +2,7 @@ <protocol name="drm"> <!-- drm support. This object is created by the server and published using the display's global event. --> - <interface name="drm" version="1"> + <interface name="wl_drm" version="1"> <!-- Call this request with the magic received from drmGetMagic(). It will be passed on to the drmAuthMagic() or DRIAuthConnection() call. This authentication must be @@ -14,12 +14,12 @@ <!-- Create a wayland buffer for the named DRM buffer. The DRM surface must have a name using the flink ioctl --> <request name="create_buffer"> - <arg name="id" type="new_id" interface="buffer"/> + <arg name="id" type="new_id" interface="wl_buffer"/> <arg name="name" type="uint"/> <arg name="width" type="int"/> <arg name="height" type="int"/> <arg name="stride" type="uint"/> - <arg name="visual" type="object" interface="visual"/> + <arg name="visual" type="object" interface="wl_visual"/> </request> <!-- Notification of the path of the drm device which is used by diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c index 6624fbe..3d5cb39 100644 --- a/src/egl/wayland/wayland-drm/wayland-drm.c +++ b/src/egl/wayland/wayland-drm/wayland-drm.c @@ -51,9 +51,8 @@ struct wl_drm { }; static void -drm_buffer_damage(struct wl_buffer *buffer_base, - struct wl_surface *surface, - int32_t x, int32_t y, int32_t width, int32_t height) +buffer_damage(struct wl_client *client, struct wl_buffer *buffer, + int32_t x, int32_t y, int32_t width, int32_t height) { } @@ -74,6 +73,7 @@ buffer_destroy(struct wl_client *client, struct wl_buffer *buffer) } const static struct wl_buffer_interface buffer_interface = { + buffer_damage, buffer_destroy }; @@ -103,8 +103,6 @@ drm_create_buffer(struct wl_client *client, struct wl_drm *drm, buffer->buffer.width = width; buffer->buffer.height = height; buffer->buffer.visual = visual; - buffer->buffer.attach = NULL; - buffer->buffer.damage = drm_buffer_damage; if (visual->object.interface != &wl_visual_interface) { /* FIXME: Define a real exception event instead of @@ -164,7 +162,9 @@ const static struct wl_drm_interface drm_interface = { }; static void -post_drm_device(struct wl_client *client, struct wl_object *global) +post_drm_device(struct wl_client *client, + struct wl_object *global, + uint32_t version) { struct wl_drm *drm = (struct wl_drm *) global; |