[mutter/wip/nielsdg/meta-multi-texture-dmabuf: 3/4] WIP
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/nielsdg/meta-multi-texture-dmabuf: 3/4] WIP
- Date: Sat, 23 May 2020 13:03:13 +0000 (UTC)
commit 1cb7146a2ed9e76ff9300cf6a20caedb4ca28951
Author: Niels De Graef <niels degraef barco com>
Date: Mon Mar 30 16:48:07 2020 +0200
WIP
meson_options.txt | 2 +-
src/wayland/meta-wayland-cursor-surface.c | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/meson_options.txt b/meson_options.txt
index 75a1961e4..a269d886e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -47,7 +47,7 @@ option('native_backend',
option('remote_desktop',
type: 'boolean',
- value: true,
+ value: false,
description: 'Enable remote desktop and screen cast support'
)
diff --git a/src/wayland/meta-wayland-cursor-surface.c b/src/wayland/meta-wayland-cursor-surface.c
index d8ac1413e..71bad9cc6 100644
--- a/src/wayland/meta-wayland-cursor-surface.c
+++ b/src/wayland/meta-wayland-cursor-surface.c
@@ -58,16 +58,20 @@ update_cursor_sprite_texture (MetaWaylandCursorSurface *cursor_surface)
MetaWaylandSurface *surface =
meta_wayland_surface_role_get_surface (META_WAYLAND_SURFACE_ROLE (cursor_surface));
MetaCursorSprite *cursor_sprite = META_CURSOR_SPRITE (priv->cursor_sprite);
- CoglTexture *texture;
+ MetaMultiTexture *texture;
if (!priv->cursor_renderer)
return;
texture = meta_wayland_surface_get_texture (surface);
+
if (texture)
{
+ /* We don't support complex textures for cursors */
+ g_return_if_fail (meta_multi_texture_is_simple (texture));
+
meta_cursor_sprite_set_texture (cursor_sprite,
- texture,
+ meta_multi_texture_get_plane (texture, 0),
priv->hot_x * surface->scale,
priv->hot_y * surface->scale);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]