[PATCH] wayland-drm: remove wl_buffer.damage

Pekka Paalanen ppaalanen at gmail.com
Tue Apr 10 05:35:06 PDT 2012

This is a related fix for the Wayland change:

commit 83685c506e76212ae4e5cb722205d98d3b0603b9
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Mon Mar 26 16:33:24 2012 -0400

    Remove wl_buffer.damage and simplify shm implementation

Apparently, this should also fix a memory leak. When wl_buffer.damage
was removed from Wayland and Mesa was not fixed, wl_buffer.destroy ended
up in the (empty) damage function instead of calling

Spotted during build as:
  CC     wayland-drm-protocol.lo
wayland-drm.c:80:2: warning: initialization from incompatible pointer type
wayland-drm.c:82:1: warning: excess elements in struct initializer
wayland-drm.c:82:1: warning: (near initialization for 'drm_buffer_interface')

Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
 src/egl/wayland/wayland-drm/wayland-drm.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c
index 42e6788..101b2c4 100644
--- a/src/egl/wayland/wayland-drm/wayland-drm.c
+++ b/src/egl/wayland/wayland-drm/wayland-drm.c
@@ -54,12 +54,6 @@ struct wl_drm_buffer {
 static void
-buffer_damage(struct wl_client *client, struct wl_resource *buffer,
-	      int32_t x, int32_t y, int32_t width, int32_t height)
-static void
 destroy_buffer(struct wl_resource *resource)
 	struct wl_drm_buffer *buffer = resource->data;
@@ -77,7 +71,6 @@ buffer_destroy(struct wl_client *client, struct wl_resource *resource)
 const static struct wl_buffer_interface drm_buffer_interface = {
-	buffer_damage,

More information about the wayland-devel mailing list