From f7cd6af9c6b2c9fce48e8c047d89d4c4db0d9cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 18 Aug 2016 11:14:03 +0800 Subject: [PATCH] MetaRendererNative: Put gbm initialization in its own function Separate gbm initialization from general renderer initialization. Do this even though no other initialization is done for now; later there will will be other types of rendering mode, initialized in their own functions. https://bugzilla.gnome.org/show_bug.cgi?id=773629 --- src/backends/native/meta-renderer-native.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c index 4410da28e..273a34efd 100644 --- a/src/backends/native/meta-renderer-native.c +++ b/src/backends/native/meta-renderer-native.c @@ -1235,11 +1235,9 @@ meta_renderer_native_finalize (GObject *object) } static gboolean -meta_renderer_native_initable_init (GInitable *initable, - GCancellable *cancellable, - GError **error) +init_gbm (MetaRendererNative *renderer_native, + GError **error) { - MetaRendererNative *renderer_native = META_RENDERER_NATIVE (initable); MetaBackend *backend = meta_get_backend (); MetaEgl *egl = meta_backend_get_egl (backend); struct gbm_device *gbm_device; @@ -1268,6 +1266,16 @@ meta_renderer_native_initable_init (GInitable *initable, return TRUE; } +static gboolean +meta_renderer_native_initable_init (GInitable *initable, + GCancellable *cancellable, + GError **error) +{ + MetaRendererNative *renderer_native = META_RENDERER_NATIVE (initable); + + return init_gbm (renderer_native, error); +} + static void initable_iface_init (GInitableIface *initable_iface) {