MetaRendererNative: Absorb CoglRendererKMS

Absorb the CoglRendererKMS struct into MetaRendererNative. The gbm
device initialization is moved earlier so that the renderer fails to
initialize if the gbm device creation failed.

https://bugzilla.gnome.org/show_bug.cgi?id=768976
This commit is contained in:
Jonas Ådahl
2016-05-09 21:22:01 +08:00
parent e420f386d2
commit 27ac0b7f27
3 changed files with 119 additions and 79 deletions

View File

@ -288,11 +288,19 @@ meta_backend_native_create_renderer (MetaBackend *backend)
MetaBackendNativePrivate *priv =
meta_backend_native_get_instance_private (native);
int kms_fd;
GError *error;
MetaRendererNative *renderer_native;
kms_fd = meta_launcher_get_kms_fd (priv->launcher);
return g_object_new (META_TYPE_RENDERER_NATIVE,
"kms-fd", kms_fd,
NULL);
renderer_native = meta_renderer_native_new (kms_fd, &error);
if (!renderer_native)
{
meta_warning ("Failed to create renderer: %s\n", error->message);
g_error_free (error);
return NULL;
}
return META_RENDERER (renderer_native);
}
static void