Simplify shm buffer handling
There was a lot of code here to do a lot of work we didn't need to do.
If we damage a surface with a shm buffer attached, all we need to do
is to re-upload the damaged region to the texture. As for drm buffers,
we don't assume anything changes on attach and only update the
regions the client tells us to update in the damage request.
diff --git a/clients/simple-shm.c b/clients/simple-shm.c
index c94ede3..7026af9 100644
--- a/clients/simple-shm.c
+++ b/clients/simple-shm.c
@@ -142,7 +142,6 @@
offset = time >> 4;
for (i = 0; i < end; i++)
p[i] = (i + offset) * 0x0080401;
- wl_buffer_damage(window->buffer, 0, 0, window->width, window->height);
wl_surface_attach(window->surface, window->buffer, 0, 0);
wl_surface_damage(window->surface,
diff --git a/clients/simple-touch.c b/clients/simple-touch.c
index b85a841..ade720e 100644
--- a/clients/simple-touch.c
+++ b/clients/simple-touch.c
@@ -184,9 +184,7 @@
p += touch->width;
p[1] = c;
- wl_buffer_damage(touch->buffer, 0, 0, touch->width, touch->height);
- wl_surface_damage(touch->surface,
- 0, 0, touch->width, touch->height);
+ wl_surface_damage(touch->surface, 0, 0, touch->width, touch->height);
}
static void
@@ -312,7 +310,6 @@
wl_surface_set_user_data(touch->surface, touch);
memset(touch->data, 64, width * height * 4);
- wl_buffer_damage(touch->buffer, 0, 0, width, height);
wl_surface_attach(touch->surface, touch->buffer, 0, 0);
wl_surface_damage(touch->surface, 0, 0, width, height);
diff --git a/clients/smoke.c b/clients/smoke.c
index d618100..2ab171f 100644
--- a/clients/smoke.c
+++ b/clients/smoke.c
@@ -220,8 +220,6 @@
render(smoke, surface);
- display_surface_damage(smoke->display, surface,
- 0, 0, smoke->width, smoke->height);
window_damage(smoke->window, 0, 0, smoke->width, smoke->height);
cairo_surface_destroy(surface);
diff --git a/clients/window.c b/clients/window.c
index 09114b5..75e3b84 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -782,21 +782,8 @@
void
window_flush(struct window *window)
{
- if (window->cairo_surface) {
- switch (window->buffer_type) {
- case WINDOW_BUFFER_TYPE_EGL_IMAGE:
- case WINDOW_BUFFER_TYPE_SHM:
- display_surface_damage(window->display,
- window->cairo_surface,
- 0, 0,
- window->allocation.width,
- window->allocation.height);
- break;
- default:
- break;
- }
+ if (window->cairo_surface)
window_attach_surface(window);
- }
}
void
@@ -2280,17 +2267,6 @@
}
void
-display_surface_damage(struct display *display, cairo_surface_t *cairo_surface,
- int32_t x, int32_t y, int32_t width, int32_t height)
-{
- struct wl_buffer *buffer;
-
- buffer = display_get_buffer_for_surface(display, cairo_surface);
-
- wl_buffer_damage(buffer, x, y, width, height);
-}
-
-void
window_damage(struct window *window, int32_t x, int32_t y,
int32_t width, int32_t height)
{
diff --git a/src/compositor.c b/src/compositor.c
index 5af20ec..3b2ebd4 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -212,7 +212,6 @@
wl_list_init(&surface->link);
wl_list_init(&surface->layer_link);
- wl_list_init(&surface->buffer_link);
surface->surface.resource.client = NULL;
@@ -637,8 +636,6 @@
compositor->destroy_image(compositor->display,
surface->image);
- wl_list_remove(&surface->buffer_link);
-
pixman_region32_fini(&surface->transform.boundingbox);
pixman_region32_fini(&surface->damage);
pixman_region32_fini(&surface->opaque);
@@ -663,7 +660,6 @@
{
struct weston_surface *es = (struct weston_surface *) surface;
struct weston_compositor *ec = es->compositor;
- struct wl_list *surfaces_attached_to;
if (!es->texture) {
glGenTextures(1, &es->texture);
@@ -679,15 +675,6 @@
if (wl_buffer_is_shm(buffer)) {
es->pitch = wl_shm_buffer_get_stride(buffer) / 4;
- glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
- es->pitch, buffer->height, 0,
- GL_BGRA_EXT, GL_UNSIGNED_BYTE,
- wl_shm_buffer_get_data(buffer));
-
- surfaces_attached_to = buffer->user_data;
-
- wl_list_remove(&es->buffer_link);
- wl_list_insert(surfaces_attached_to, &es->buffer_link);
} else {
if (es->image != EGL_NO_IMAGE_KHR)
ec->destroy_image(ec->display, es->image);
@@ -1187,6 +1174,17 @@
struct weston_surface *es = resource->data;
weston_surface_damage_rectangle(es, x, y, width, height);
+
+ if (es->buffer && wl_buffer_is_shm(es->buffer)) {
+ glBindTexture(GL_TEXTURE_2D, es->texture);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
+ es->pitch, es->buffer->height, 0,
+ GL_BGRA_EXT, GL_UNSIGNED_BYTE,
+ wl_shm_buffer_get_data(es->buffer));
+
+ /* Hmm, should use glTexSubImage2D() here but GLES2 doesn't
+ * support any unpack attributes except GL_UNPACK_ALIGNMENT. */
+ }
}
static void
@@ -1877,6 +1875,9 @@
if (device->input_device.pointer_focus->resource.client != client)
return;
+ if (device->sprite->buffer)
+ wl_list_remove(&device->sprite->buffer_destroy_listener.link);
+
if (!buffer_resource) {
if (device->sprite->output)
weston_surface_unmap(device->sprite);
@@ -1897,8 +1898,13 @@
device->input_device.y - device->hotspot_y,
buffer->width, buffer->height);
+ device->sprite->buffer = buffer;
+ wl_list_insert(buffer->resource.destroy_listener_list.prev,
+ &device->sprite->buffer_destroy_listener.link);
+
weston_buffer_attach(buffer, &device->sprite->surface);
- weston_surface_damage(device->sprite);
+ surface_damage(NULL, &device->sprite->surface.resource,
+ 0, 0, buffer->width, buffer->height);
}
const static struct wl_input_device_interface input_device_interface = {
@@ -1946,6 +1952,7 @@
device, bind_input_device);
device->sprite = weston_surface_create(ec);
+ device->sprite->surface.resource.data = device->sprite;
device->compositor = ec;
device->hotspot_x = 16;
@@ -2273,61 +2280,6 @@
}
static void
-shm_buffer_created(struct wl_buffer *buffer)
-{
- struct wl_list *surfaces_attached_to;
-
- surfaces_attached_to = malloc(sizeof *surfaces_attached_to);
- if (!surfaces_attached_to) {
- buffer->user_data = NULL;
- return;
- }
-
- wl_list_init(surfaces_attached_to);
-
- buffer->user_data = surfaces_attached_to;
-}
-
-static void
-shm_buffer_damaged(struct wl_buffer *buffer,
- int32_t x, int32_t y, int32_t width, int32_t height)
-{
- struct wl_list *surfaces_attached_to = buffer->user_data;
- struct weston_surface *es;
- GLsizei tex_width = wl_shm_buffer_get_stride(buffer) / 4;
-
- wl_list_for_each(es, surfaces_attached_to, buffer_link) {
- glBindTexture(GL_TEXTURE_2D, es->texture);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
- tex_width, buffer->height, 0,
- GL_BGRA_EXT, GL_UNSIGNED_BYTE,
- wl_shm_buffer_get_data(buffer));
- /* Hmm, should use glTexSubImage2D() here but GLES2 doesn't
- * support any unpack attributes except GL_UNPACK_ALIGNMENT. */
- }
-}
-
-static void
-shm_buffer_destroyed(struct wl_buffer *buffer)
-{
- struct wl_list *surfaces_attached_to = buffer->user_data;
- struct weston_surface *es, *next;
-
- wl_list_for_each_safe(es, next, surfaces_attached_to, buffer_link) {
- wl_list_remove(&es->buffer_link);
- wl_list_init(&es->buffer_link);
- }
-
- free(surfaces_attached_to);
-}
-
-const static struct wl_shm_callbacks shm_callbacks = {
- shm_buffer_created,
- shm_buffer_damaged,
- shm_buffer_destroyed
-};
-
-static void
compositor_bind(struct wl_client *client,
void *data, uint32_t version, uint32_t id)
{
@@ -2349,7 +2301,7 @@
ec, compositor_bind))
return -1;
- ec->shm = wl_shm_init(display, &shm_callbacks);
+ wl_display_init_shm(display);
ec->image_target_texture_2d =
(void *) eglGetProcAddress("glEGLImageTargetTexture2DOES");
@@ -2429,8 +2381,6 @@
weston_binding_list_destroy_all(&ec->binding_list);
- wl_shm_finish(ec->shm);
-
wl_array_release(&ec->vertices);
wl_array_release(&ec->indices);
}
diff --git a/src/compositor.h b/src/compositor.h
index a5f8d8a..c106f17 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -284,7 +284,6 @@
int32_t pitch;
struct wl_list link;
struct wl_list layer_link;
- struct wl_list buffer_link;
struct weston_shader *shader;
GLfloat color[4];
uint32_t alpha;