1
0
Fork 0

renderer: Pass through the monitor to the create_view vfunc

We will want to use the monitor in a later commit and going there from a
logical monitor or output is ambiguous.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3930>
This commit is contained in:
Sebastian Wick 2024-07-05 19:09:57 +02:00 committed by Marge Bot
parent af83233be3
commit ccede14a09
4 changed files with 11 additions and 1 deletions

View file

@ -94,6 +94,7 @@ meta_renderer_create_cogl_renderer (MetaRenderer *renderer)
static MetaRendererView * static MetaRendererView *
meta_renderer_create_view (MetaRenderer *renderer, meta_renderer_create_view (MetaRenderer *renderer,
MetaLogicalMonitor *logical_monitor, MetaLogicalMonitor *logical_monitor,
MetaMonitor *monitor,
MetaOutput *output, MetaOutput *output,
MetaCrtc *crtc, MetaCrtc *crtc,
GError **error) GError **error)
@ -102,6 +103,7 @@ meta_renderer_create_view (MetaRenderer *renderer,
view = META_RENDERER_GET_CLASS (renderer)->create_view (renderer, view = META_RENDERER_GET_CLASS (renderer)->create_view (renderer,
logical_monitor, logical_monitor,
monitor,
output, output,
crtc, crtc,
error); error);
@ -138,7 +140,12 @@ create_crtc_view (MetaLogicalMonitor *logical_monitor,
MetaRendererView *view; MetaRendererView *view;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
view = meta_renderer_create_view (renderer, logical_monitor, output, crtc, &error); view = meta_renderer_create_view (renderer,
logical_monitor,
monitor,
output,
crtc,
&error);
if (!view) if (!view)
{ {
g_warning ("Failed to create view for %s on %s: %s", g_warning ("Failed to create view for %s on %s: %s",

View file

@ -40,6 +40,7 @@ struct _MetaRendererClass
CoglRenderer * (* create_cogl_renderer) (MetaRenderer *renderer); CoglRenderer * (* create_cogl_renderer) (MetaRenderer *renderer);
MetaRendererView * (* create_view) (MetaRenderer *renderer, MetaRendererView * (* create_view) (MetaRenderer *renderer,
MetaLogicalMonitor *logical_monitor, MetaLogicalMonitor *logical_monitor,
MetaMonitor *monitor,
MetaOutput *output, MetaOutput *output,
MetaCrtc *crtc, MetaCrtc *crtc,
GError **error); GError **error);

View file

@ -1402,6 +1402,7 @@ get_transfer_function_from_output (MetaOutput *output)
static MetaRendererView * static MetaRendererView *
meta_renderer_native_create_view (MetaRenderer *renderer, meta_renderer_native_create_view (MetaRenderer *renderer,
MetaLogicalMonitor *logical_monitor, MetaLogicalMonitor *logical_monitor,
MetaMonitor *monitor,
MetaOutput *output, MetaOutput *output,
MetaCrtc *crtc, MetaCrtc *crtc,
GError **error) GError **error)

View file

@ -63,6 +63,7 @@ create_offscreen (CoglContext *cogl_context,
static MetaRendererView * static MetaRendererView *
meta_renderer_x11_nested_create_view (MetaRenderer *renderer, meta_renderer_x11_nested_create_view (MetaRenderer *renderer,
MetaLogicalMonitor *logical_monitor, MetaLogicalMonitor *logical_monitor,
MetaMonitor *monitor,
MetaOutput *output, MetaOutput *output,
MetaCrtc *crtc, MetaCrtc *crtc,
GError **error) GError **error)