[mutter/wip/wayland] squash: Update because wl_shm_buffer is no longer a wl_buffer (2)
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/wayland] squash: Update because wl_shm_buffer is no longer a wl_buffer (2)
- Date: Mon, 8 Jul 2013 17:41:22 +0000 (UTC)
commit ecb49dadd8c78f8c7a6f8dd57c93be17564e7533
Author: Neil Roberts <neil linux intel com>
Date: Mon Jul 8 16:53:54 2013 +0100
squash: Update because wl_shm_buffer is no longer a wl_buffer (2)
This should be squashed into the commit:
“wayland: Add an actor for the cursor”
Based on this clayland commit:
https://github.com/clutter-project/clayland/commit/d08f31d22ad63c
src/wayland/meta-wayland-seat.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index 5f9c27a..e39e971 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -95,10 +95,9 @@ meta_wayland_seat_update_sprite (MetaWaylandSeat *seat)
MetaWaylandStage *stage = META_WAYLAND_STAGE (seat->current_stage);
ClutterBackend *backend = clutter_get_default_backend ();
CoglContext *context = clutter_backend_get_cogl_context (backend);
+ struct wl_resource *buffer = seat->sprite->buffer_ref.buffer->resource;
CoglTexture2D *texture =
- cogl_wayland_texture_2d_new_from_buffer (context,
- seat->sprite->buffer,
- NULL);
+ cogl_wayland_texture_2d_new_from_buffer (context, buffer, NULL);
meta_wayland_stage_set_cursor_from_texture (stage,
COGL_TEXTURE (texture),
@@ -143,7 +142,7 @@ pointer_set_cursor (struct wl_client *client,
seat->sprite = surface;
- if (seat->sprite->buffer)
+ if (seat->sprite->buffer_ref.buffer)
meta_wayland_seat_update_sprite (seat);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]