backends/native: Pass KMS file path to renderer
The KMS file path will later be used for EGLDevice based rendering. https://bugzilla.gnome.org/show_bug.cgi?id=773629
This commit is contained in:
parent
da1c1d9c22
commit
77b7ecfd04
@ -290,11 +290,13 @@ meta_backend_native_create_renderer (MetaBackend *backend)
|
|||||||
MetaBackendNativePrivate *priv =
|
MetaBackendNativePrivate *priv =
|
||||||
meta_backend_native_get_instance_private (native);
|
meta_backend_native_get_instance_private (native);
|
||||||
int kms_fd;
|
int kms_fd;
|
||||||
|
const char *kms_file_path;
|
||||||
GError *error = NULL;
|
GError *error = NULL;
|
||||||
MetaRendererNative *renderer_native;
|
MetaRendererNative *renderer_native;
|
||||||
|
|
||||||
kms_fd = meta_launcher_get_kms_fd (priv->launcher);
|
kms_fd = meta_launcher_get_kms_fd (priv->launcher);
|
||||||
renderer_native = meta_renderer_native_new (kms_fd, &error);
|
kms_file_path = meta_launcher_get_kms_file_path (priv->launcher);
|
||||||
|
renderer_native = meta_renderer_native_new (kms_fd, kms_file_path, &error);
|
||||||
if (!renderer_native)
|
if (!renderer_native)
|
||||||
{
|
{
|
||||||
meta_warning ("Failed to create renderer: %s\n", error->message);
|
meta_warning ("Failed to create renderer: %s\n", error->message);
|
||||||
|
@ -58,6 +58,7 @@ enum
|
|||||||
PROP_0,
|
PROP_0,
|
||||||
|
|
||||||
PROP_KMS_FD,
|
PROP_KMS_FD,
|
||||||
|
PROP_KMS_FILE_PATH,
|
||||||
|
|
||||||
PROP_LAST
|
PROP_LAST
|
||||||
};
|
};
|
||||||
@ -85,6 +86,7 @@ struct _MetaRendererNative
|
|||||||
MetaRenderer parent;
|
MetaRenderer parent;
|
||||||
|
|
||||||
int kms_fd;
|
int kms_fd;
|
||||||
|
char *kms_file_path;
|
||||||
|
|
||||||
EGLDisplay egl_display;
|
EGLDisplay egl_display;
|
||||||
|
|
||||||
@ -1204,6 +1206,9 @@ meta_renderer_native_get_property (GObject *object,
|
|||||||
case PROP_KMS_FD:
|
case PROP_KMS_FD:
|
||||||
g_value_set_int (value, renderer_native->kms_fd);
|
g_value_set_int (value, renderer_native->kms_fd);
|
||||||
break;
|
break;
|
||||||
|
case PROP_KMS_FILE_PATH:
|
||||||
|
g_value_set_string (value, renderer_native->kms_file_path);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
break;
|
break;
|
||||||
@ -1223,6 +1228,9 @@ meta_renderer_native_set_property (GObject *object,
|
|||||||
case PROP_KMS_FD:
|
case PROP_KMS_FD:
|
||||||
renderer_native->kms_fd = g_value_get_int (value);
|
renderer_native->kms_fd = g_value_get_int (value);
|
||||||
break;
|
break;
|
||||||
|
case PROP_KMS_FILE_PATH:
|
||||||
|
renderer_native->kms_file_path = g_strdup (g_value_get_string (value));
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
break;
|
break;
|
||||||
@ -1236,6 +1244,8 @@ meta_renderer_native_finalize (GObject *object)
|
|||||||
|
|
||||||
g_clear_pointer (&renderer_native->gbm.device, gbm_device_destroy);
|
g_clear_pointer (&renderer_native->gbm.device, gbm_device_destroy);
|
||||||
|
|
||||||
|
g_free (renderer_native->kms_file_path);
|
||||||
|
|
||||||
G_OBJECT_CLASS (meta_renderer_native_parent_class)->finalize (object);
|
G_OBJECT_CLASS (meta_renderer_native_parent_class)->finalize (object);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1313,16 +1323,26 @@ meta_renderer_native_class_init (MetaRendererNativeClass *klass)
|
|||||||
0, G_MAXINT, 0,
|
0, G_MAXINT, 0,
|
||||||
G_PARAM_READWRITE |
|
G_PARAM_READWRITE |
|
||||||
G_PARAM_CONSTRUCT_ONLY));
|
G_PARAM_CONSTRUCT_ONLY));
|
||||||
|
g_object_class_install_property (object_class,
|
||||||
|
PROP_KMS_FILE_PATH,
|
||||||
|
g_param_spec_string ("kms-file-path",
|
||||||
|
"KMS file path",
|
||||||
|
"The KMS file path",
|
||||||
|
NULL,
|
||||||
|
G_PARAM_READWRITE |
|
||||||
|
G_PARAM_CONSTRUCT_ONLY));
|
||||||
}
|
}
|
||||||
|
|
||||||
MetaRendererNative *
|
MetaRendererNative *
|
||||||
meta_renderer_native_new (int kms_fd,
|
meta_renderer_native_new (int kms_fd,
|
||||||
GError **error)
|
const char *kms_file_path,
|
||||||
|
GError **error)
|
||||||
{
|
{
|
||||||
MetaRendererNative *renderer_native;
|
MetaRendererNative *renderer_native;
|
||||||
|
|
||||||
renderer_native = g_object_new (META_TYPE_RENDERER_NATIVE,
|
renderer_native = g_object_new (META_TYPE_RENDERER_NATIVE,
|
||||||
"kms-fd", kms_fd,
|
"kms-fd", kms_fd,
|
||||||
|
"kms-file-path", kms_file_path,
|
||||||
NULL);
|
NULL);
|
||||||
if (!g_initable_init (G_INITABLE (renderer_native), NULL, error))
|
if (!g_initable_init (G_INITABLE (renderer_native), NULL, error))
|
||||||
{
|
{
|
||||||
|
@ -35,8 +35,9 @@ G_DECLARE_FINAL_TYPE (MetaRendererNative, meta_renderer_native,
|
|||||||
META, RENDERER_NATIVE,
|
META, RENDERER_NATIVE,
|
||||||
MetaRenderer)
|
MetaRenderer)
|
||||||
|
|
||||||
MetaRendererNative *meta_renderer_native_new (int kms_fd,
|
MetaRendererNative *meta_renderer_native_new (int kms_fd,
|
||||||
GError **error);
|
const char *kms_file_path,
|
||||||
|
GError **error);
|
||||||
|
|
||||||
struct gbm_device * meta_renderer_native_get_gbm (MetaRendererNative *renderer_native);
|
struct gbm_device * meta_renderer_native_get_gbm (MetaRendererNative *renderer_native);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user