further destruct collection.h

Remove some imports from collection.h, include them directly in any
files that needs them instead.

Author: ardera

src/compositor_ng.c

@@ -11,6 +11,7 @@
 #define _GNU_SOURCE
 #include "compositor_ng.h"
 
+#include <errno.h>
 #include <inttypes.h>
 #include <math.h>
 #include <stdlib.h>
@@ -21,6 +22,8 @@
 #include <flutter_embedder.h>
 #include <systemd/sd-event.h>
 
+#include "cursor.h"
+#include "dummy_render_surface.h"
 #include "flutter-pi.h"
 #include "frame_scheduler.h"
 #include "modesetting.h"
@@ -31,9 +34,9 @@
 #include "tracer.h"
 #include "util/collection.h"
 #include "util/dynarray.h"
+#include "util/logging.h"
+#include "util/refcounting.h"
 #include "window.h"
-#include "cursor.h"
-#include "dummy_render_surface.h"
 
 #include "config.h"
 
@@ -343,7 +346,8 @@ static int compositor_push_fl_layers(struct compositor *compositor, size_t n_fl_
             /// TODO: Implement
             layer->surface = compositor_get_view_by_id_locked(compositor, fl_layer->platform_view->identifier);
             if (layer->surface == NULL) {
-                layer->surface = CAST_SURFACE(dummy_render_surface_new(compositor->tracer, VEC2I(fl_layer->size.width, fl_layer->size.height)));
+                layer->surface =
+                    CAST_SURFACE(dummy_render_surface_new(compositor->tracer, VEC2I(fl_layer->size.width, fl_layer->size.height)));
             }
 #else
             // in release mode, we just assume the id is valid.
@@ -529,7 +533,15 @@ const FlutterCompositor *compositor_get_flutter_compositor(struct compositor *co
     return &compositor->flutter_compositor;
 }
 
-void compositor_set_cursor(struct compositor *compositor, bool has_enabled, bool enabled, bool has_kind, enum pointer_kind kind, bool has_delta, struct vec2f delta) {
+void compositor_set_cursor(
+    struct compositor *compositor,
+    bool has_enabled,
+    bool enabled,
+    bool has_kind,
+    enum pointer_kind kind,
+    bool has_delta,
+    struct vec2f delta
+) {
     if (!has_enabled && !has_kind && !has_delta) {
         return;
     }

src/compositor_ng.h

@@ -12,12 +12,13 @@
 
 #include <flutter_embedder.h>
 
+#include "cursor.h"
 #include "flutter-pi.h"
 #include "frame_scheduler.h"
 #include "modesetting.h"
 #include "pixel_format.h"
 #include "util/collection.h"
-#include "cursor.h"
+#include "util/refcounting.h"
 
 #include "config.h"
 
@@ -183,7 +184,15 @@ int compositor_get_event_fd(struct compositor *compositor);
 
 int compositor_on_event_fd_ready(struct compositor *compositor);
 
-void compositor_set_cursor(struct compositor *compositor, bool has_enabled, bool enabled, bool has_kind, enum pointer_kind kind, bool has_delta, struct vec2f delta);
+void compositor_set_cursor(
+    struct compositor *compositor,
+    bool has_enabled,
+    bool enabled,
+    bool has_kind,
+    enum pointer_kind kind,
+    bool has_delta,
+    struct vec2f delta
+);
 
 struct fl_layer_composition;
 

src/cursor.c

@@ -35,6 +35,7 @@
 
 #include "dmabuf_surface.h"
 
+#include <errno.h>
 #include <stdatomic.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -44,6 +45,8 @@
 #include "surface_private.h"
 #include "texture_registry.h"
 #include "util/collection.h"
+#include "util/logging.h"
+#include "util/refcounting.h"
 
 #include "config.h"
 

src/dmabuf_surface.c

@@ -10,6 +10,7 @@
 
 #include "dummy_render_surface.h"
 
+#include <errno.h>
 #include <stdatomic.h>
 #include <stdlib.h>
 
@@ -19,7 +20,6 @@
 #include "render_surface_private.h"
 #include "surface.h"
 #include "surface_private.h"
-
 #include "tracer.h"
 #include "util/geometry.h"
 #include "util/uuid.h"
@@ -61,11 +61,7 @@ static int dummy_render_surface_present_fbdev(struct surface *s, const struct fl
 static int dummy_render_surface_fill(struct render_surface *surface, FlutterBackingStore *fl_store);
 static int dummy_render_surface_queue_present(struct render_surface *surface, const FlutterBackingStore *fl_store);
 
-int dummy_render_surface_init(
-    struct dummy_render_surface *surface,
-    struct tracer *tracer,
-    struct vec2i size
-) {
+int dummy_render_surface_init(struct dummy_render_surface *surface, struct tracer *tracer, struct vec2i size) {
     int ok;
 
     ok = render_surface_init(CAST_RENDER_SURFACE_UNCHECKED(surface), tracer, size);
@@ -85,10 +81,7 @@ int dummy_render_surface_init(
     return 0;
 }
 
-struct dummy_render_surface *dummy_render_surface_new(
-    struct tracer *tracer,
-    struct vec2i size
-) {
+struct dummy_render_surface *dummy_render_surface_new(struct tracer *tracer, struct vec2i size) {
     struct dummy_render_surface *surface;
     int ok;
 
@@ -115,7 +108,8 @@ void dummy_render_surface_deinit(struct surface *s) {
     render_surface_deinit(s);
 }
 
-static int dummy_render_surface_present_kms(struct surface *s, UNUSED const struct fl_layer_props *props, UNUSED struct kms_req_builder *builder) {
+static int
+dummy_render_surface_present_kms(struct surface *s, UNUSED const struct fl_layer_props *props, UNUSED struct kms_req_builder *builder) {
     (void) props;
     (void) builder;
 
@@ -124,8 +118,7 @@ static int dummy_render_surface_present_kms(struct surface *s, UNUSED const stru
     return 0;
 }
 
-static int
-dummy_render_surface_present_fbdev(struct surface *s, const struct fl_layer_props *props, struct fbdev_commit_builder *builder) {
+static int dummy_render_surface_present_fbdev(struct surface *s, const struct fl_layer_props *props, struct fbdev_commit_builder *builder) {
     (void) s;
     (void) props;
     (void) builder;
@@ -147,6 +140,6 @@ static int dummy_render_surface_queue_present(struct render_surface *s, const Fl
     (void) fl_store;
 
     TRACER_INSTANT(s->surface.tracer, "dummy_render_surface_queue_present");
-    
+
     return 0;
 }

src/dummy_render_surface.c

@@ -24,9 +24,6 @@ ATTR_PURE struct dummy_render_surface *__checked_cast_dummy_render_surface(void
     #define CAST_DUMMY_RENDER_SURFACE(ptr) CAST_DUMMY_RENDER_SURFACE_UNCHECKED(ptr)
 #endif
 
-struct dummy_render_surface *dummy_render_surface_new(
-    struct tracer *tracer,
-    struct vec2i size
-);
+struct dummy_render_surface *dummy_render_surface_new(struct tracer *tracer, struct vec2i size);
 
 #endif  // _FLUTTERPI_INCLUDE_DUMMY_RENDER_SURFACE_H

src/dummy_render_surface.h

@@ -401,6 +401,8 @@
 // For functions part of EGL 1.5 we dynamically resolve the functions at
 // runtime, since we can't be sure they're actually present.
 #if defined(EGL_VERSION_1_5) && !defined(EGL_EGL_PROTOTYPES)
+
+// clang-format off
 typedef EGLSync(EGLAPIENTRYP PFNEGLCREATESYNCPROC)(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list);
 typedef EGLBoolean(EGLAPIENTRYP PFNEGLDESTROYSYNCPROC)(EGLDisplay dpy, EGLSync sync);
 typedef EGLint(EGLAPIENTRYP PFNEGLCLIENTWAITSYNCPROC)(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout);
@@ -427,6 +429,8 @@ typedef EGLSurface(EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC)(
     const EGLAttrib *attrib_list
 );
 typedef EGLBoolean(EGLAPIENTRYP PFNEGLWAITSYNCPROC)(EGLDisplay dpy, EGLSync sync, EGLint flags);
+// clang-format on
+
 #endif
 
 #ifdef HAVE_EGL

src/egl.h

@@ -10,6 +10,7 @@
 
 #include "egl_gbm_render_surface.h"
 
+#include <errno.h>
 #include <stdlib.h>
 
 #include "egl.h"
@@ -22,6 +23,8 @@
 #include "surface.h"
 #include "tracer.h"
 #include "util/collection.h"
+#include "util/logging.h"
+#include "util/refcounting.h"
 
 struct egl_gbm_render_surface;
 
@@ -418,9 +421,10 @@ static int egl_gbm_render_surface_present_kms(struct surface *s, const struct fl
             LOG_ERROR("Couldn't add GBM buffer as DRM framebuffer.\n");
             goto fail_free_meta;
         }
-        
+
         // if this EGL surface is non-opaque and has an opaque equivalent
-        if (!get_pixfmt_info(egl_surface->pixel_format)->is_opaque && pixfmt_opaque(egl_surface->pixel_format) != egl_surface->pixel_format) {
+        if (!get_pixfmt_info(egl_surface->pixel_format)->is_opaque &&
+            pixfmt_opaque(egl_surface->pixel_format) != egl_surface->pixel_format) {
             opaque_fb_id = drmdev_add_fb(
                 drmdev,
                 gbm_bo_get_width(bo),
@@ -638,7 +642,7 @@ static int egl_gbm_render_surface_queue_present(struct render_surface *s, const
     ///     version: 1.4
     ///     vendor: Mesa Project
     ///     client extensions: EGL_EXT_client_extensions EGL_EXT_device_base EGL_EXT_device_enumeration EGL_EXT_device_query EGL_EXT_platform_base EGL_KHR_client_get_all_proc_addresses EGL_KHR_debug EGL_EXT_platform_device EGL_MESA_platform_gbm EGL_KHR_platform_gbm EGL_MESA_platform_surfaceless
-    ///     display extensions: EGL_ANDROID_blob_cache EGL_EXT_buffer_age EGL_EXT_image_dma_buf_import EGL_EXT_image_dma_buf_import_modifiers EGL_KHR_cl_event2 EGL_KHR_config_attribs EGL_KHR_context_flush_control EGL_KHR_create_context EGL_KHR_create_context_no_error EGL_KHR_fence_sync EGL_KHR_get_all_proc_addresses EGL_KHR_gl_colorspace EGL_KHR_gl_renderbuffer_image EGL_KHR_gl_texture_2D_image EGL_KHR_gl_texture_3D_image EGL_KHR_gl_texture_cubemap_image EGL_KHR_image EGL_KHR_image_base EGL_KHR_image_pixmap EGL_KHR_no_config_context EGL_KHR_reusable_sync EGL_KHR_surfaceless_context EGL_EXT_pixel_format_float EGL_KHR_wait_sync EGL_MESA_configless_context EGL_MESA_drm_image EGL_MESA_image_dma_buf_export EGL_MESA_query_driver 
+    ///     display extensions: EGL_ANDROID_blob_cache EGL_EXT_buffer_age EGL_EXT_image_dma_buf_import EGL_EXT_image_dma_buf_import_modifiers EGL_KHR_cl_event2 EGL_KHR_config_attribs EGL_KHR_context_flush_control EGL_KHR_create_context EGL_KHR_create_context_no_error EGL_KHR_fence_sync EGL_KHR_get_all_proc_addresses EGL_KHR_gl_colorspace EGL_KHR_gl_renderbuffer_image EGL_KHR_gl_texture_2D_image EGL_KHR_gl_texture_3D_image EGL_KHR_gl_texture_cubemap_image EGL_KHR_image EGL_KHR_image_base EGL_KHR_image_pixmap EGL_KHR_no_config_context EGL_KHR_reusable_sync EGL_KHR_surfaceless_context EGL_EXT_pixel_format_float EGL_KHR_wait_sync EGL_MESA_configless_context EGL_MESA_drm_image EGL_MESA_image_dma_buf_export EGL_MESA_query_driver
     ///   ===================================
     ///   ===================================
     ///   OpenGL ES information:
@@ -655,7 +659,7 @@ static int egl_gbm_render_surface_queue_present(struct render_surface *s, const
     ///     physical size: 154mm x 86mm
     ///     flutter device pixel ratio: 1.367054
     ///     pixel format: (any)
-    ///   pluginregistry.c: Initialized plugins: services, text input, raw keyboard plugin, gstreamer video_player, audioplayers, 
+    ///   pluginregistry.c: Initialized plugins: services, text input, raw keyboard plugin, gstreamer video_player, audioplayers,
     ///   flutter: The Dart VM service is listening on http://192.168.178.11:44515/F3wK7cUNFd0=/
     ///   gl_renderer.c: Choosing EGL config with pixel format ARGB 8:8:8:8...
     ///   gl_renderer.c: Choosing EGL config with pixel format ARGB 8:8:8:8...

src/egl_gbm_render_surface.c

@@ -10,6 +10,7 @@
 #include <systemd/sd-event.h>
 
 #include "util/collection.h"
+#include "util/refcounting.h"
 
 struct evloop {
     refcount_t n_refs;

src/event_loop.c

@@ -49,4 +49,4 @@ struct evloop *evthread_get_evloop(struct evthread *thread);
 
 void evthread_join(struct evthread *thread);
 
-#endif // _EVENT_LOOP_H
+#endif  // _EVENT_LOOP_H