diff options
author | Stanislav Vorobiov <s.vorobiov@samsung.com> | 2014-07-29 10:23:14 +0400 |
---|---|---|
committer | Stanislav Vorobiov <s.vorobiov@samsung.com> | 2014-07-29 10:24:35 +0400 |
commit | 268e6c69d3363a9efae61400ae9fa93087bd8e18 (patch) | |
tree | 7ba5d783bcaa52c4580afe5e7431b446ac2f37cd /wayland-drm | |
parent | f19f89d68723c868e3b1d8bbf75e04cf4e1809ba (diff) | |
download | emulator-yagl-268e6c69d3363a9efae61400ae9fa93087bd8e18.tar.gz emulator-yagl-268e6c69d3363a9efae61400ae9fa93087bd8e18.tar.bz2 emulator-yagl-268e6c69d3363a9efae61400ae9fa93087bd8e18.zip |
Revert "Remove static variable for identifying wl_drm buffers"
This reverts commit f19f89d68723c868e3b1d8bbf75e04cf4e1809ba.
Change-Id: Iab08ab64a0ede945298e5006cb441ea0c1d4ca4f
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Diffstat (limited to 'wayland-drm')
-rw-r--r-- | wayland-drm/wayland-drm.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/wayland-drm/wayland-drm.c b/wayland-drm/wayland-drm.c index 2fe8036..0259dfb 100644 --- a/wayland-drm/wayland-drm.c +++ b/wayland-drm/wayland-drm.c @@ -12,7 +12,6 @@ struct wl_drm char *device_name; struct wayland_drm_callbacks *callbacks; void *user_data; - struct wl_buffer_interface buffer_interface; }; struct wl_drm_buffer @@ -39,6 +38,11 @@ static void drm_buffer_destroy(struct wl_client *client, wl_resource_destroy(resource); } +static struct wl_buffer_interface drm_buffer_interface = +{ + drm_buffer_destroy +}; + static void drm_create_buffer(struct wl_client *client, struct wl_resource *resource, uint32_t id, uint32_t name, @@ -82,7 +86,7 @@ static void drm_create_buffer(struct wl_client *client, buffer->resource.object.id = id; buffer->resource.object.interface = &wl_buffer_interface; - buffer->resource.object.implementation = (void(**)(void))&drm->buffer_interface; + buffer->resource.object.implementation = (void(**)(void))&drm_buffer_interface; buffer->resource.data = buffer; buffer->resource.destroy = buffer_destroy; @@ -174,7 +178,6 @@ struct wl_drm *wayland_drm_create(struct wl_display *display, drm->callbacks = callbacks; drm->user_data = user_data; - drm->buffer_interface.destroy = drm_buffer_destroy; wl_global_create(display, &wl_drm_interface, 1, drm, bind_drm); return drm; @@ -187,7 +190,7 @@ void wayland_drm_destroy(struct wl_drm *drm) free(drm); } -struct wl_drm_buffer *wayland_drm_get_buffer(struct wl_drm *drm, struct wl_resource *resource) +struct wl_drm_buffer *wayland_drm_get_buffer(struct wl_resource *resource) { if (!resource) { return NULL; @@ -195,7 +198,7 @@ struct wl_drm_buffer *wayland_drm_get_buffer(struct wl_drm *drm, struct wl_resou if (wl_resource_instance_of(resource, &wl_buffer_interface, - &drm->buffer_interface)) { + &drm_buffer_interface)) { return wl_resource_get_user_data(resource); } else { return NULL; |