[mutter] clutter: Remove 'features'



commit 9a68fb19e4e6c2d794714b55e06fab4e9170e8a8
Author: Jonas Ã…dahl <jadahl gmail com>
Date:   Fri Sep 17 23:17:24 2021 +0200

    clutter: Remove 'features'
    
    There are no 'features' left, the last one, GLSL shader support, was
    moved to Cogl.
    
    This also move the Cogl context creation to a more sensible place, as it
    was hidden away in the feature initialization.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2015>

 clutter/clutter/clutter-backend-private.h |   1 -
 clutter/clutter/clutter-enums.h           |  14 ---
 clutter/clutter/clutter-feature.c         | 142 ------------------------------
 clutter/clutter/clutter-feature.h         |  42 ---------
 clutter/clutter/clutter-main.c            |   6 +-
 clutter/clutter/clutter-private.h         |   4 -
 clutter/clutter/clutter-shader-effect.c   |   1 -
 clutter/clutter/clutter.h                 |   1 -
 clutter/clutter/meson.build               |   2 -
 9 files changed, 1 insertion(+), 212 deletions(-)
---
diff --git a/clutter/clutter/clutter-backend-private.h b/clutter/clutter/clutter-backend-private.h
index 88bb3ea5fc..95e992ac08 100644
--- a/clutter/clutter/clutter-backend-private.h
+++ b/clutter/clutter/clutter-backend-private.h
@@ -71,7 +71,6 @@ struct _ClutterBackendClass
   ClutterStageWindow *  (* create_stage)       (ClutterBackend  *backend,
                                                 ClutterStage    *wrapper,
                                                 GError         **error);
-  void                  (* init_features)      (ClutterBackend  *backend);
   CoglRenderer *        (* get_renderer)       (ClutterBackend  *backend,
                                                 GError         **error);
   CoglDisplay *         (* get_display)        (ClutterBackend  *backend,
diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h
index 99debc1c11..a5c9d6ad01 100644
--- a/clutter/clutter/clutter-enums.h
+++ b/clutter/clutter/clutter-enums.h
@@ -903,20 +903,6 @@ typedef enum /*< prefix=CLUTTER_SCROLL >*/
   CLUTTER_SCROLL_SMOOTH
 } ClutterScrollDirection;
 
-/**
- * ClutterFeatureFlags:
- * @CLUTTER_FEATURE_SHADERS_GLSL: Set if the backend supports GLSL shaders.
- *
- * Runtime flags indicating specific features available via Clutter window
- * system and graphics backend.
- *
- * Since: 0.4
- */
-typedef enum
-{
-  CLUTTER_FEATURE_SHADERS_GLSL           = (1 << 9),
-} ClutterFeatureFlags;
-
 /**
  * ClutterFlowOrientation:
  * @CLUTTER_FLOW_HORIZONTAL: Arrange the children of the flow layout
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 5b01783e5e..d1aec04e5f 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -55,7 +55,6 @@
 #include "clutter-backend-private.h"
 #include "clutter-debug.h"
 #include "clutter-event-private.h"
-#include "clutter-feature.h"
 #include "clutter-input-device-private.h"
 #include "clutter-input-pointer-a11y-private.h"
 #include "clutter-graphene.h"
@@ -522,10 +521,7 @@ clutter_init_real (ClutterMainContext  *clutter_context,
   if (clutter_paint_debug_flags & CLUTTER_DEBUG_PAINT_DAMAGE_REGION)
     g_message ("Enabling damaged region");
 
-  /* this will take care of initializing Cogl's state and
-   * query the GL machinery for features
-   */
-  if (!clutter_feature_init (clutter_context, error))
+  if (!_clutter_backend_create_context (clutter_context->backend, error))
     return FALSE;
 
   clutter_text_direction = clutter_get_text_direction ();
diff --git a/clutter/clutter/clutter-private.h b/clutter/clutter/clutter-private.h
index 117902a35f..f16333e0aa 100644
--- a/clutter/clutter/clutter-private.h
+++ b/clutter/clutter/clutter-private.h
@@ -34,7 +34,6 @@
 #include "clutter-backend.h"
 #include "clutter-effect.h"
 #include "clutter-event.h"
-#include "clutter-feature.h"
 #include "clutter-id-pool.h"
 #include "clutter-layout-manager.h"
 #include "clutter-settings.h"
@@ -167,9 +166,6 @@ CLUTTER_EXPORT
 gboolean                _clutter_context_is_initialized                 (void);
 gboolean                _clutter_context_get_show_fps                   (void);
 
-gboolean clutter_feature_init (ClutterMainContext  *clutter_context,
-                               GError             **error);
-
 /* Diagnostic mode */
 gboolean        _clutter_diagnostic_enabled     (void);
 void            _clutter_diagnostic_message     (const char *fmt, ...) G_GNUC_PRINTF (1, 2);
diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c
index a23480567e..b2e577b635 100644
--- a/clutter/clutter/clutter-shader-effect.c
+++ b/clutter/clutter/clutter-shader-effect.c
@@ -119,7 +119,6 @@
 
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
-#include "clutter-feature.h"
 #include "clutter-private.h"
 #include "clutter-shader-types.h"
 
diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index be788b9e56..0d43ce4785 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -59,7 +59,6 @@
 #include "clutter-enums.h"
 #include "clutter-enum-types.h"
 #include "clutter-event.h"
-#include "clutter-feature.h"
 #include "clutter-fixed-layout.h"
 #include "clutter-flow-layout.h"
 #include "clutter-frame-clock.h"
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 2b8764a0f1..f30edadd51 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -33,7 +33,6 @@ clutter_headers = [
   'clutter-effect.h',
   'clutter-enums.h',
   'clutter-event.h',
-  'clutter-feature.h',
   'clutter-fixed-layout.h',
   'clutter-flow-layout.h',
   'clutter-frame-clock.h',
@@ -123,7 +122,6 @@ clutter_sources = [
   'clutter-desaturate-effect.c',
   'clutter-effect.c',
   'clutter-event.c',
-  'clutter-feature.c',
   'clutter-fixed-layout.c',
   'clutter-flatten-effect.c',
   'clutter-flow-layout.c',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]