summaryrefslogtreecommitdiff
path: root/src/backends/native/meta-launcher.c
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2016-05-09 19:51:29 +0800
committerJonas Ådahl <jadahl@gmail.com>2016-07-20 14:23:48 +0800
commite420f386d2b97fc64a49cbe56de5e17430430ae4 (patch)
tree48acac5973b3214e19a795169e284ec1bdedc691 /src/backends/native/meta-launcher.c
parent2ceff4ee9b3d9e94f6ad72ac4256786d0c5b62c2 (diff)
downloadmutter-e420f386d2b97fc64a49cbe56de5e17430430ae4.tar.gz
Move cogl KMS winsys into the native backend
Move the KMS interaction from cogl into mutter, where most of the other KMS interaction already takes place. This also removes dead code which were only excercised when non-mutter callers used the cogl KMS backend. The cogl KMS API was updated to pass via MetaRendererNative instead of via the different cogl objects. https://bugzilla.gnome.org/show_bug.cgi?id=768976
Diffstat (limited to 'src/backends/native/meta-launcher.c')
-rw-r--r--src/backends/native/meta-launcher.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c
index 5991fc740..ea28e5a3d 100644
--- a/src/backends/native/meta-launcher.c
+++ b/src/backends/native/meta-launcher.c
@@ -45,6 +45,7 @@
#include "backends/meta-backend-private.h"
#include "meta-cursor-renderer-native.h"
#include "meta-idle-monitor-native.h"
+#include "meta-renderer-native.h"
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref)
@@ -108,21 +109,20 @@ get_seat_proxy (GCancellable *cancellable,
static void
session_unpause (void)
{
- ClutterBackend *clutter_backend;
- CoglContext *cogl_context;
- CoglDisplay *cogl_display;
+ MetaBackend *backend;
+ MetaRenderer *renderer;
- clutter_backend = clutter_get_default_backend ();
- cogl_context = clutter_backend_get_cogl_context (clutter_backend);
- cogl_display = cogl_context_get_display (cogl_context);
- cogl_kms_display_queue_modes_reset (cogl_display);
+ backend = meta_get_backend ();
+ renderer = meta_backend_get_renderer (backend);
+ meta_renderer_native_queue_modes_reset (META_RENDERER_NATIVE (renderer));
clutter_evdev_reclaim_devices ();
clutter_egl_thaw_master_clock ();
{
MetaBackend *backend = meta_get_backend ();
- MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (backend);
+ MetaCursorRendererNative *cursor_renderer_native =
+ META_CURSOR_RENDERER_NATIVE (meta_backend_get_cursor_renderer (backend));
ClutterActor *stage = meta_backend_get_stage (backend);
/* When we mode-switch back, we need to immediately queue a redraw
@@ -130,7 +130,7 @@ session_unpause (void)
* update. */
clutter_actor_queue_redraw (stage);
- meta_cursor_renderer_native_force_update (META_CURSOR_RENDERER_NATIVE (renderer));
+ meta_cursor_renderer_native_force_update (cursor_renderer_native);
meta_idle_monitor_native_reset_idletime (meta_idle_monitor_get_core ());
}
}