brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter/backend: Provide a default get_display implementation

Browse Source 
As there is no on screen template checks done on the x11 backend implementation
so simplify that.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3915>
This commit is contained in:
Bilal Elmoussaoui
2024-08-01 14:04:35 +02:00
committed by Bilal Elmoussaoui
parent 5277e33d37
commit b684dc0382
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
clutter/clutter/clutter-backend.c
View File

@ -132,16 +132,9 @@ clutter_backend_do_real_create_context (ClutterBackend *backend,
goto error; goto error;
CLUTTER_NOTE (BACKEND, "Creating Cogl display"); CLUTTER_NOTE (BACKEND, "Creating Cogl display");
if (klass->get_display != NULL)
{
backend->cogl_display = klass->get_display (backend, backend->cogl_display = klass->get_display (backend,
backend->cogl_renderer, backend->cogl_renderer,
error); error);
}
else
{
backend->cogl_display = cogl_display_new (backend->cogl_renderer);
}
if (backend->cogl_display == NULL) if (backend->cogl_display == NULL)
goto error; goto error;
@ -241,6 +234,14 @@ clutter_backend_real_create_context (ClutterBackend *backend,
return TRUE; return TRUE;
} }
static CoglDisplay *
clutter_backend_real_get_display (ClutterBackend *backend,
CoglRenderer *renderer,
GError **error)
{
return cogl_display_new (renderer);
}
static void static void
clutter_backend_class_init (ClutterBackendClass *klass) clutter_backend_class_init (ClutterBackendClass *klass)
{ {
@ -296,6 +297,7 @@ clutter_backend_class_init (ClutterBackendClass *klass)
klass->resolution_changed = clutter_backend_real_resolution_changed; klass->resolution_changed = clutter_backend_real_resolution_changed;
klass->create_context = clutter_backend_real_create_context; klass->create_context = clutter_backend_real_create_context;
klass->get_display = clutter_backend_real_get_display;
} }
static void static void

9
src/backends/x11/meta-clutter-backend-x11.c
View File

@ -66,14 +66,6 @@ static const gchar *atom_names[] = {
#define N_ATOM_NAMES G_N_ELEMENTS (atom_names) #define N_ATOM_NAMES G_N_ELEMENTS (atom_names)
static CoglDisplay *
meta_clutter_backend_x11_get_display (ClutterBackend *clutter_backend,
CoglRenderer *renderer,
GError **error)
{
return cogl_display_new (renderer);
}
static CoglRenderer * static CoglRenderer *
meta_clutter_backend_x11_get_renderer (ClutterBackend *clutter_backend, meta_clutter_backend_x11_get_renderer (ClutterBackend *clutter_backend,
GError **error) GError **error)
@ -138,7 +130,6 @@ meta_clutter_backend_x11_class_init (MetaClutterBackendX11Class *klass)
{ {
ClutterBackendClass *clutter_backend_class = CLUTTER_BACKEND_CLASS (klass); ClutterBackendClass *clutter_backend_class = CLUTTER_BACKEND_CLASS (klass);
clutter_backend_class->get_display = meta_clutter_backend_x11_get_display;
clutter_backend_class->get_renderer = meta_clutter_backend_x11_get_renderer; clutter_backend_class->get_renderer = meta_clutter_backend_x11_get_renderer;
clutter_backend_class->create_stage = meta_clutter_backend_x11_create_stage; clutter_backend_class->create_stage = meta_clutter_backend_x11_create_stage;
clutter_backend_class->get_default_seat = meta_clutter_backend_x11_get_default_seat; clutter_backend_class->get_default_seat = meta_clutter_backend_x11_get_default_seat;