output: Make implementations inherit MetaOutput

Instead of the home baked "inheritance" system, using a gpointer and a
GDestroyNotify function to keep the what effectively is sub type
details, make MetaOutput an abstract derivable type, and make the
implementations inherit it.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1287

src/backends/native/meta-crtc-kms.c

@@ -157,7 +157,7 @@ generate_crtc_connector_list (MetaGpu  *gpu,
       if (assigned_crtc == crtc)
         {
           MetaKmsConnector *kms_connector =
-            meta_output_kms_get_kms_connector (output);
+            meta_output_kms_get_kms_connector (META_OUTPUT_KMS (output));
 
           connectors = g_list_prepend (connectors, kms_connector);
         }

src/backends/native/meta-gpu-kms.c

@@ -238,7 +238,8 @@ meta_gpu_kms_set_power_save_mode (MetaGpuKms    *gpu_kms,
     {
       MetaOutput *output = l->data;
 
-      meta_output_kms_set_power_save_mode (output, state, kms_update);
+      meta_output_kms_set_power_save_mode (META_OUTPUT_KMS (output),
+                                           state, kms_update);
     }
 }
 
@@ -367,7 +368,8 @@ find_output_by_connector_id (GList    *outputs,
     {
       MetaOutput *output = l->data;
 
-      if (meta_output_kms_get_connector_id (output) == connector_id)
+      if (meta_output_kms_get_connector_id (META_OUTPUT_KMS (output)) ==
+          connector_id)
         return output;
     }
 
@@ -391,7 +393,8 @@ setup_output_clones (MetaGpu *gpu)
           if (other_output == output)
             continue;
 
-          if (meta_output_kms_can_clone (output, other_output))
+          if (meta_output_kms_can_clone (META_OUTPUT_KMS (output),
+                                         META_OUTPUT_KMS (other_output)))
             meta_output_add_possible_clone (output, other_output);
         }
     }
@@ -515,7 +518,7 @@ init_outputs (MetaGpuKms *gpu_kms)
     {
       MetaKmsConnector *kms_connector = l->data;
       const MetaKmsConnectorState *connector_state;
-      MetaOutput *output;
+      MetaOutputKms *output_kms;
       MetaOutput *old_output;
       GError *error = NULL;
 
@@ -526,18 +529,18 @@ init_outputs (MetaGpuKms *gpu_kms)
       old_output =
         find_output_by_connector_id (old_outputs,
                                      meta_kms_connector_get_id (kms_connector));
-      output = meta_create_kms_output (gpu_kms,
-                                       kms_connector,
-                                       old_output,
-                                       &error);
-      if (!output)
+      output_kms = meta_output_kms_new (gpu_kms,
+                                        kms_connector,
+                                        old_output,
+                                        &error);
+      if (!output_kms)
         {
           g_warning ("Failed to create KMS output: %s", error->message);
           g_error_free (error);
         }
       else
         {
-          outputs = g_list_prepend (outputs, output);
+          outputs = g_list_prepend (outputs, output_kms);
         }
     }
 

src/backends/native/meta-monitor-manager-kms.c

@@ -95,7 +95,7 @@ static GBytes *
 meta_monitor_manager_kms_read_edid (MetaMonitorManager *manager,
                                     MetaOutput         *output)
 {
-  return meta_output_kms_read_edid (output);
+  return meta_output_kms_read_edid (META_OUTPUT_KMS (output));
 }
 
 static void

src/backends/native/meta-output-kms.c

@@ -44,19 +44,19 @@ typedef struct _MetaOutputKms
   MetaKmsConnector *kms_connector;
 } MetaOutputKms;
 
-MetaKmsConnector *
-meta_output_kms_get_kms_connector (MetaOutput *output)
-{
-  MetaOutputKms *output_kms = output->driver_private;
+G_DEFINE_TYPE (MetaOutputKms, meta_output_kms, META_TYPE_OUTPUT)
 
+MetaKmsConnector *
+meta_output_kms_get_kms_connector (MetaOutputKms *output_kms)
+{
   return output_kms->kms_connector;
 }
 
 void
-meta_output_kms_set_underscan (MetaOutput    *output,
+meta_output_kms_set_underscan (MetaOutputKms *output_kms,
                                MetaKmsUpdate *kms_update)
 {
-  MetaOutputKms *output_kms = output->driver_private;
+  MetaOutput *output = META_OUTPUT (output_kms);
   const MetaOutputInfo *output_info = meta_output_get_info (output);
 
   if (!output_info->supports_underscanning)
@@ -93,20 +93,16 @@ meta_output_kms_set_underscan (MetaOutput    *output,
 }
 
 uint32_t
-meta_output_kms_get_connector_id (MetaOutput *output)
+meta_output_kms_get_connector_id (MetaOutputKms *output_kms)
 {
-  MetaOutputKms *output_kms = output->driver_private;
-
   return meta_kms_connector_get_id (output_kms->kms_connector);
 }
 
 void
-meta_output_kms_set_power_save_mode (MetaOutput    *output,
+meta_output_kms_set_power_save_mode (MetaOutputKms *output_kms,
                                      uint64_t       dpms_state,
                                      MetaKmsUpdate *kms_update)
 {
-  MetaOutputKms *output_kms = output->driver_private;
-
   g_debug ("Setting DPMS state of connector %s to %" G_GUINT64_FORMAT,
            meta_kms_connector_get_name (output_kms->kms_connector),
            dpms_state);
@@ -117,20 +113,16 @@ meta_output_kms_set_power_save_mode (MetaOutput    *output,
 }
 
 gboolean
-meta_output_kms_can_clone (MetaOutput *output,
-                           MetaOutput *other_output)
+meta_output_kms_can_clone (MetaOutputKms *output_kms,
+                           MetaOutputKms *other_output_kms)
 {
-  MetaOutputKms *output_kms = output->driver_private;
-  MetaOutputKms *other_output_kms = other_output->driver_private;
-
   return meta_kms_connector_can_clone (output_kms->kms_connector,
                                        other_output_kms->kms_connector);
 }
 
 GBytes *
-meta_output_kms_read_edid (MetaOutput *output)
+meta_output_kms_read_edid (MetaOutputKms *output_kms)
 {
-  MetaOutputKms *output_kms = output->driver_private;
   const MetaKmsConnectorState *connector_state;
   GBytes *edid_data;
 
@@ -143,16 +135,6 @@ meta_output_kms_read_edid (MetaOutput *output)
   return g_bytes_new_from_bytes (edid_data, 0, g_bytes_get_size (edid_data));
 }
 
-static void
-meta_output_destroy_notify (MetaOutput *output)
-{
-  MetaOutputKms *output_kms;
-
-  output_kms = output->driver_private;
-
-  g_slice_free (MetaOutputKms, output_kms);
-}
-
 static void
 add_common_modes (MetaOutputInfo *output_info,
                   MetaGpuKms     *gpu_kms)
@@ -287,11 +269,11 @@ init_output_modes (MetaOutputInfo    *output_info,
   return TRUE;
 }
 
-MetaOutput *
-meta_create_kms_output (MetaGpuKms        *gpu_kms,
-                        MetaKmsConnector  *kms_connector,
-                        MetaOutput        *old_output,
-                        GError           **error)
+MetaOutputKms *
+meta_output_kms_new (MetaGpuKms        *gpu_kms,
+                     MetaKmsConnector  *kms_connector,
+                     MetaOutput        *old_output,
+                     GError           **error)
 {
   MetaGpu *gpu = META_GPU (gpu_kms);
   uint32_t connector_id;
@@ -355,16 +337,12 @@ meta_create_kms_output (MetaGpuKms        *gpu_kms,
 
   output_info->tile_info = connector_state->tile_info;
 
-  output = g_object_new (META_TYPE_OUTPUT,
+  output = g_object_new (META_TYPE_OUTPUT_KMS,
                          "id", ((uint64_t) gpu_id << 32) | connector_id,
                          "gpu", gpu,
                          "info", output_info,
                          NULL);
-
-  output_kms = g_slice_new0 (MetaOutputKms);
-  output->driver_private = output_kms;
-  output->driver_notify = (GDestroyNotify) meta_output_destroy_notify;
-
+  output_kms = META_OUTPUT_KMS (output);
   output_kms->kms_connector = kms_connector;
 
   if (connector_state->current_crtc_id)
@@ -401,5 +379,15 @@ meta_create_kms_output (MetaGpuKms        *gpu_kms,
       meta_output_unassign_crtc (output);
     }
 
-  return output;
+  return output_kms;
+}
+
+static void
+meta_output_kms_init (MetaOutputKms *output_kms)
+{
+}
+
+static void
+meta_output_kms_class_init (MetaOutputKmsClass *klass)
+{
 }

src/backends/native/meta-output-kms.h

@@ -27,23 +27,28 @@
 #include "backends/native/meta-gpu-kms.h"
 #include "backends/native/meta-kms-types.h"
 
-void meta_output_kms_set_power_save_mode (MetaOutput    *output,
+#define META_TYPE_OUTPUT_KMS (meta_output_kms_get_type ())
+G_DECLARE_FINAL_TYPE (MetaOutputKms, meta_output_kms,
+                      META, OUTPUT_KMS,
+                      MetaOutput)
+
+void meta_output_kms_set_power_save_mode (MetaOutputKms *output_kms,
                                           uint64_t       dpms_state,
                                           MetaKmsUpdate *kms_update);
 
-void meta_output_kms_set_underscan (MetaOutput    *output,
+void meta_output_kms_set_underscan (MetaOutputKms *output_kms,
                                     MetaKmsUpdate *kms_update);
 
-gboolean meta_output_kms_can_clone (MetaOutput *output,
-                                    MetaOutput *other_output);
+gboolean meta_output_kms_can_clone (MetaOutputKms *output_kms,
+                                    MetaOutputKms *other_output_kms);
 
-MetaKmsConnector * meta_output_kms_get_kms_connector (MetaOutput *output);
+MetaKmsConnector * meta_output_kms_get_kms_connector (MetaOutputKms *output_kms);
 
-uint32_t meta_output_kms_get_connector_id (MetaOutput *output);
+uint32_t meta_output_kms_get_connector_id (MetaOutputKms *output_kms);
 
-GBytes * meta_output_kms_read_edid (MetaOutput *output);
+GBytes * meta_output_kms_read_edid (MetaOutputKms *output_kms);
 
-MetaOutput * meta_create_kms_output (MetaGpuKms        *gpu_kms,
+MetaOutputKms * meta_output_kms_new (MetaGpuKms        *gpu_kms,
                                      MetaKmsConnector  *kms_connector,
                                      MetaOutput        *old_output,
                                      GError           **error);

src/backends/native/meta-renderer-native.c

@@ -1436,7 +1436,8 @@ meta_onscreen_native_set_crtc_mode (CoglOnscreen              *onscreen,
     }
 
   meta_crtc_kms_set_mode (onscreen_native->crtc, kms_update);
-  meta_output_kms_set_underscan (onscreen_native->output, kms_update);
+  meta_output_kms_set_underscan (META_OUTPUT_KMS (onscreen_native->output),
+                                 kms_update);
 }
 
 static void