mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Add wlsc_shm_buffer_attach

Browse Source
This commit is contained in:
Benjamin Franzke
2011-03-07 15:17:56 +01:00
committed by Kristian Høgsberg
parent bde55ec8e4
commit 0c347f0d72
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor.c
+2 -2
View File
@@ -293,8 +293,8 @@ wlsc_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface)
struct wlsc_surface *es = (struct wlsc_surface *) surface; struct wlsc_surface *es = (struct wlsc_surface *) surface;
struct wlsc_compositor *ec = es->compositor; struct wlsc_compositor *ec = es->compositor;
if (buffer->attach) { if (wlsc_is_shm_buffer(buffer)) {
buffer->attach(buffer, surface); wlsc_shm_buffer_attach(buffer, surface);
} else { } else {
es->image = eglCreateImageKHR(ec->display, NULL, es->image = eglCreateImageKHR(ec->display, NULL,
EGL_WAYLAND_BUFFER_WL, EGL_WAYLAND_BUFFER_WL,
compositor/compositor.h
+6
View File
@@ -244,6 +244,12 @@ wlsc_selection_set_focus(struct wl_selection *selection,
uint32_t uint32_t
get_time(void); get_time(void);
int
wlsc_is_shm_buffer(struct wl_buffer *buffer);
void
wlsc_shm_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface);
struct wl_buffer * struct wl_buffer *
wlsc_shm_buffer_create(struct wlsc_compositor *ec, wlsc_shm_buffer_create(struct wlsc_compositor *ec,
int32_t width, int32_t height, int32_t width, int32_t height,
compositor/shm.c
+16 -8
View File
@@ -86,8 +86,16 @@ const static struct wl_buffer_interface buffer_interface = {
buffer_destroy buffer_destroy
}; };
static void int
shm_buffer_attach(struct wl_buffer *buffer_base, struct wl_surface *surface) wlsc_is_shm_buffer(struct wl_buffer *buffer)
{
return buffer->resource.object.implementation ==
(void (**)(void)) &buffer_interface;
}
void
wlsc_shm_buffer_attach(struct wl_buffer *buffer_base,
struct wl_surface *surface)
{ {
struct wlsc_surface *es = (struct wlsc_surface *) surface; struct wlsc_surface *es = (struct wlsc_surface *) surface;
struct wlsc_shm_buffer *buffer = struct wlsc_shm_buffer *buffer =
@@ -121,10 +129,15 @@ wlsc_shm_buffer_init(struct wlsc_compositor *compositor,
buffer->buffer.width = width; buffer->buffer.width = width;
buffer->buffer.height = height; buffer->buffer.height = height;
buffer->buffer.visual = visual; buffer->buffer.visual = visual;
buffer->buffer.attach = shm_buffer_attach;
buffer->stride = stride; buffer->stride = stride;
buffer->data = data; buffer->data = data;
buffer->buffer.resource.object.interface = &wl_buffer_interface;
buffer->buffer.resource.object.implementation = (void (**)(void))
&buffer_interface;
buffer->buffer.resource.destroy = destroy_buffer;
return buffer; return buffer;
} }
@@ -183,11 +196,6 @@ shm_create_buffer(struct wl_client *client, struct wl_shm *shm,
buffer->mapped = 1; buffer->mapped = 1;
buffer->buffer.resource.object.id = id; buffer->buffer.resource.object.id = id;
buffer->buffer.resource.object.interface = &wl_buffer_interface;
buffer->buffer.resource.object.implementation = (void (**)(void))
&buffer_interface;
buffer->buffer.resource.destroy = destroy_buffer;
wl_client_add_resource(client, &buffer->buffer.resource); wl_client_add_resource(client, &buffer->buffer.resource);
} }