use config.h file for feature config

- make all source files that query features import `config.h`
- change clang-format to sort config.h last in includes

Author: ardera

.clang-format

@@ -92,13 +92,18 @@ IncludeCategories:
   # POSIX headers
   - Regex: '^<(ctype|dlfcn|fcntl|glob|limits|locale|poll|pthread|regex|semaphore|unistd|sys/mman|sys/stat|sys/types|sys/select)\.h>$'
     Priority: 2
-  # everything else
+  # all <> includes
   - Regex: '^<[^>]*>$'
     Priority: 3
-  - Regex: '^"[^"]*"$'
-    Priority: 6
-  - Regex: '.*'
+  # config header should go last
+  - Regex: '^"config\.h"$'
     Priority: 5
+  # all "" includes
+  - Regex: '^"[^"]*"$'
+    Priority: 4
+  # all other includes
+  - Regex: '^.*$'
+    Priority: 4
 
 IncludeIsMainRegex: '(_test)?$'
 IndentCaseLabels: true

CMakeLists.txt

@@ -129,6 +129,7 @@ target_link_libraries(flutterpi_module PUBLIC
 target_include_directories(flutterpi_module PUBLIC
   ${CMAKE_SOURCE_DIR}/third_party/flutter_embedder_header/include
   ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}
 )
 
 target_compile_options(flutterpi_module PUBLIC
@@ -152,23 +153,18 @@ list(GET LIBINPUT_VERSION_AS_LIST 0 LIBINPUT_VERSION_MAJOR)
 list(GET LIBINPUT_VERSION_AS_LIST 1 LIBINPUT_VERSION_MINOR)
 list(GET LIBINPUT_VERSION_AS_LIST 2 LIBINPUT_VERSION_PATCH)
 
-target_compile_definitions(flutterpi_module PUBLIC
-  LIBINPUT_VERSION_MAJOR=${LIBINPUT_VERSION_MAJOR}
-  LIBINPUT_VERSION_MINOR=${LIBINPUT_VERSION_MINOR}
-  LIBINPUT_VERSION_PATCH=${LIBINPUT_VERSION_PATCH}
-)
-
 # TODO: Just unconditionally define those, make them optional later
-target_compile_definitions(flutterpi_module PUBLIC HAVE_KMS HAVE_GBM HAVE_FBDEV)
-
-# OpenGL
-pkg_check_modules(EGL IMPORTED_TARGET egl)
-pkg_check_modules(GLES2 IMPORTED_TARGET glesv2)
+set(HAVE_KMS ON)
+set(HAVE_GBM ON)
+set(HAVE_FBDEV ON)
 
+# OpenGL support
 set(HAVE_EGL OFF)
 set(HAVE_GLES2 OFF)
 set(HAVE_EGL_GLES2 OFF)
 
+pkg_check_modules(EGL IMPORTED_TARGET egl)
+pkg_check_modules(GLES2 IMPORTED_TARGET glesv2)
 if (ENABLE_OPENGL)
   if (EGL_FOUND AND GLES2_FOUND)
     target_sources(flutterpi_module PRIVATE
@@ -179,10 +175,10 @@ if (ENABLE_OPENGL)
       PkgConfig::EGL
       PkgConfig::GLES2
     )
+
     set(HAVE_EGL ON)
     set(HAVE_GLES2 ON)
     set(HAVE_EGL_GLES2 ON)
-    target_compile_definitions(flutterpi_module PUBLIC HAVE_EGL HAVE_GLES2 HAVE_EGL_GLES2)
   elseif (TRY_ENABLE_OPENGL)
     message("EGL and/or OpenGL was not found. Flutter-pi will build without EGL/OpenGL rendering support.")
   else()
@@ -192,16 +188,12 @@ endif()
 
 message(STATUS "EGL/GLES support ....... ${HAVE_EGL_GLES2}")
 
-if (LINT_EGL_HEADERS)
-  target_compile_definitions(flutterpi_module PUBLIC LINT_EGL_HEADERS)
-  message(STATUS "Lint EGL headers ....... ON")
-else()
-  message(STATUS "Lint EGL headers ....... OFF")
-endif()
-
-pkg_check_modules(VULKAN IMPORTED_TARGET vulkan)
+message(STATUS "Lint EGL headers ....... ${LINT_EGL_HEADERS}")
 
+# Vulkan support
 set(HAVE_VULKAN OFF)
+
+pkg_check_modules(VULKAN IMPORTED_TARGET vulkan)
 if (ENABLE_VULKAN)
   if (VULKAN_FOUND)
     target_sources(flutterpi_module PRIVATE
@@ -211,8 +203,8 @@ if (ENABLE_VULKAN)
     target_link_libraries(flutterpi_module PUBLIC
       PkgConfig::VULKAN
     )
+
     set(HAVE_VULKAN ON)
-    target_compile_definitions(flutterpi_module PUBLIC HAVE_VULKAN)
   elseif (TRY_ENABLE_VULKAN)
     message("Vulkan was not found. Flutter-pi will build without vulkan rendering support.")
   else()
@@ -222,6 +214,7 @@ endif()
 
 message(STATUS "Vulkan support ......... ${HAVE_VULKAN}")
 
+# We need at least one renderer
 if (NOT HAVE_VULKAN AND NOT HAVE_EGL_GLES2)
   message(SEND_ERROR "At least one of the EGL/GLES2 and Vulkan backends must be enabled.")
 endif()
@@ -234,14 +227,17 @@ if(NOT FILESYSTEM_LAYOUT IN_LIST FILESYSTEM_LAYOUTS)
 endif()
 
 message(STATUS "Filesystem Layout ...... ${FILESYSTEM_LAYOUT}")
+
+# config.h takes the defines in form of #cmakedefine FILESYSTEM_LAYOUT_DEFAULT, ...
 if(FILESYSTEM_LAYOUT STREQUAL default)
-  target_compile_definitions(flutterpi_module PUBLIC "FILESYSTEM_LAYOUT_DEFAULT")
+  set(FILESYSTEM_LAYOUT_DEFAULT ON)
 elseif(FILESYSTEM_LAYOUT STREQUAL meta-flutter)
-  target_compile_definitions(flutterpi_module PUBLIC "FILESYSTEM_LAYOUT_METAFLUTTER")
+  set(FILESYSTEM_LAYOUT_METAFLUTTER ON)
 endif()
 
 # Session switching support (using libseat)
-message(STATUS "Session switching ...... ${ENABLE_SESSION_SWITCHING}")
+set(HAVE_LIBSEAT OFF)
+
 if (ENABLE_SESSION_SWITCHING)
   if (TRY_ENABLE_SESSION_SWITCHING)
     pkg_check_modules(LIBSEAT IMPORTED_TARGET libseat)
@@ -251,30 +247,22 @@ if (ENABLE_SESSION_SWITCHING)
 
   if (LIBSEAT_FOUND)
     target_link_libraries(flutterpi_module PUBLIC PkgConfig::LIBSEAT)
-    target_compile_definitions(flutterpi_module PUBLIC HAVE_LIBSEAT)
+    set(HAVE_LIBSEAT ON)
   else()
     message("libseat was not found. flutter-pi will be built without session switching support.")
   endif()
 endif()
 
-if (DEBUG_DRM_PLANE_ALLOCATIONS)
-  target_compile_definitions(flutterpi_module PUBLIC DEBUG_DRM_PLANE_ALLOCATIONS)
-endif()
-
-if (USE_LEGACY_KMS)
-  target_compile_definitions(flutterpi_module PUBLIC USE_LEGACY_KMS)
-endif()
+message(STATUS "Session switching ...... ${HAVE_LIBSEAT}")
 
 # TODO: We actually don't need the compile definitions anymore, except for
 # text input and raw keyboard plugin (because those have special treatment
 # in flutter-pi.c)
 if (BUILD_TEXT_INPUT_PLUGIN)
   target_sources(flutterpi_module PRIVATE src/plugins/text_input.c)
-  target_compile_definitions(flutterpi_module PUBLIC "BUILD_TEXT_INPUT_PLUGIN")
 endif()
 if (BUILD_RAW_KEYBOARD_PLUGIN)
   target_sources(flutterpi_module PRIVATE src/plugins/raw_keyboard.c)
-  target_compile_definitions(flutterpi_module PUBLIC "BUILD_RAW_KEYBOARD_PLUGIN")
 endif()
 if (BUILD_TEST_PLUGIN)
   target_sources(flutterpi_module PRIVATE src/plugins/testplugin.c)
@@ -305,11 +293,6 @@ if (BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN)
       list(GET LIBGSTREAMER_VERSION_AS_LIST 1 LIBGSTREAMER_VERSION_MINOR)
       list(GET LIBGSTREAMER_VERSION_AS_LIST 2 LIBGSTREAMER_VERSION_PATCH)
 
-      target_compile_definitions(flutterpi_module PUBLIC
-        LIBGSTREAMER_VERSION_MAJOR=${LIBGSTREAMER_VERSION_MAJOR}
-        LIBGSTREAMER_VERSION_MINOR=${LIBGSTREAMER_VERSION_MINOR}
-        LIBGSTREAMER_VERSION_PATCH=${LIBGSTREAMER_VERSION_PATCH}
-      )
       target_sources(flutterpi_module PRIVATE
         src/plugins/gstreamer_video_player/plugin.c
         src/plugins/gstreamer_video_player/player.c
@@ -359,10 +342,16 @@ endif()
 target_link_options(flutterpi_module PUBLIC -rdynamic)
 
 # Define VULKAN_DEBUG if it was set to On, or if it was set to AUTO and we're using debug mode.
-if (VULKAN_DEBUG STREQUAL "AUTO")
-  target_compile_definitions(flutterpi_module PUBLIC $<$<CONFIG:Debug>:VULKAN_DEBUG>)
-elseif (VULKAN_DEBUG)
-  target_compile_definitions(flutterpi_module PUBLIC VULKAN_DEBUG)
+if (VULKAN_DEBUG MATCHES AUTO)
+  if (CMAKE_BUILD_TYPE MATCHES DEBUG)
+    set(VULKAN_DEBUG ON)
+  else()
+    set(VULKAN_DEBUG OFF)
+  endif()
+elseif (VULKAN_DEBUG MATCHES "OFF")
+  set(VULKAN_DEBUG OFF)
+elseif (VULKAN_DEBUG MATCHES "ON")
+  set(VULKAN_DEBUG ON)
 endif()
 
 # Some sanitizer configs.
@@ -389,9 +378,8 @@ if (ENABLE_UBSAN)
   target_link_options(flutterpi_module PUBLIC -fsanitize=undefined)
   target_compile_options(flutterpi_module PUBLIC -fsanitize=undefined)
 endif()
-if (ENABLE_MTRACE)
-  target_compile_definitions(flutterpi_module PUBLIC "ENABLE_MTRACE")
-endif()
+
+configure_file(config.h.in config.h @ONLY)
 
 # Actual flutter-pi executable.
 add_executable(

config.h.in

@@ -0,0 +1,28 @@
+#ifndef _FLUTTERPI_CONFIG_H
+#define _FLUTTERPI_CONFIG_H
+
+#define LIBINPUT_VERSION_MAJOR @LIBINPUT_VERSION_MAJOR@
+#define LIBINPUT_VERSION_MINOR @LIBINPUT_VERSION_MINOR@
+#define LIBINPUT_VERSION_PATCH @LIBINPUT_VERSION_PATCH@
+#cmakedefine HAVE_KMS
+#cmakedefine HAVE_GBM
+#cmakedefine HAVE_FBDEV
+#cmakedefine HAVE_EGL
+#cmakedefine HAVE_GLES2
+#cmakedefine HAVE_EGL_GLES2
+#cmakedefine LINT_EGL_HEADERS
+#cmakedefine HAVE_VULKAN
+#cmakedefine FILESYSTEM_LAYOUT_DEFAULT
+#cmakedefine FILESYSTEM_LAYOUT_METAFLUTTER
+#cmakedefine HAVE_LIBSEAT
+#cmakedefine DEBUG_DRM_PLANE_ALLOCATIONS
+#cmakedefine USE_LEGACY_KMS
+#cmakedefine BUILD_TEXT_INPUT_PLUGIN
+#cmakedefine BUILD_RAW_KEYBOARD_PLUGIN
+#define LIBGSTREAMER_VERSION_MAJOR @LIBGSTREAMER_VERSION_MAJOR@
+#define LIBGSTREAMER_VERSION_MINOR @LIBGSTREAMER_VERSION_MINOR@
+#define LIBGSTREAMER_VERSION_PATCH @LIBGSTREAMER_VERSION_PATCH@
+#cmakedefine VULKAN_DEBUG
+#cmakedefine ENABLE_MTRACE
+
+#endif

src/compositor_ng.c

@@ -9,6 +9,8 @@
  */
 
 #define _GNU_SOURCE
+#include "compositor_ng.h"
+
 #include <inttypes.h>
 #include <math.h>
 #include <stdlib.h>
@@ -19,7 +21,6 @@
 #include <flutter_embedder.h>
 #include <systemd/sd-event.h>
 
-#include "compositor_ng.h"
 #include "flutter-pi.h"
 #include "frame_scheduler.h"
 #include "modesetting.h"
@@ -32,6 +33,8 @@
 #include "util/dynarray.h"
 #include "window.h"
 
+#include "config.h"
+
 #ifdef HAVE_GBM
     #include <gbm.h>
 #endif

src/compositor_ng.h

@@ -18,6 +18,8 @@
 #include "pixel_format.h"
 #include "util/collection.h"
 
+#include "config.h"
+
 #ifdef HAVE_EGL_GLES2
     #include "egl.h"
 #endif

src/dmabuf_surface.c

@@ -45,6 +45,8 @@
 #include "texture_registry.h"
 #include "util/collection.h"
 
+#include "config.h"
+
 FILE_DESCR("dmabuf surface")
 
 struct refcounted_dmabuf {

src/egl.h

@@ -11,6 +11,8 @@
 #include <stdbool.h>
 #include <string.h>
 
+#include "config.h"
+
 #ifndef HAVE_EGL
     #error "egl.h was included but EGL support is disabled."
 #endif
@@ -399,16 +401,32 @@
 // 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)
-    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);
-    typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBPROC) (EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value);
-    typedef EGLImage (EGLAPIENTRYP PFNEGLCREATEIMAGEPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list);
-    typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEPROC) (EGLDisplay dpy, EGLImage image);
-    typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYPROC) (EGLenum platform, void *native_display, const EGLAttrib *attrib_list);
-    typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list);
-    typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list);
-    typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags);
+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);
+typedef EGLBoolean(EGLAPIENTRYP PFNEGLGETSYNCATTRIBPROC)(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value);
+typedef EGLImage(EGLAPIENTRYP PFNEGLCREATEIMAGEPROC)(
+    EGLDisplay dpy,
+    EGLContext ctx,
+    EGLenum target,
+    EGLClientBuffer buffer,
+    const EGLAttrib *attrib_list
+);
+typedef EGLBoolean(EGLAPIENTRYP PFNEGLDESTROYIMAGEPROC)(EGLDisplay dpy, EGLImage image);
+typedef EGLDisplay(EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYPROC)(EGLenum platform, void *native_display, const EGLAttrib *attrib_list);
+typedef EGLSurface(EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEPROC)(
+    EGLDisplay dpy,
+    EGLConfig config,
+    void *native_window,
+    const EGLAttrib *attrib_list
+);
+typedef EGLSurface(EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC)(
+    EGLDisplay dpy,
+    EGLConfig config,
+    void *native_pixmap,
+    const EGLAttrib *attrib_list
+);
+typedef EGLBoolean(EGLAPIENTRYP PFNEGLWAITSYNCPROC)(EGLDisplay dpy, EGLSync sync, EGLint flags);
 #endif
 
 #ifdef HAVE_EGL
@@ -432,7 +450,6 @@ static inline bool check_egl_extension(const char *client_ext_string, const char
     return false;
 }
 
-
 static inline const char *egl_strerror(EGLenum result) {
     switch (result) {
         case EGL_SUCCESS: return "EGL_SUCCESS";
@@ -454,7 +471,7 @@ static inline const char *egl_strerror(EGLenum result) {
     }
 }
 
-#define LOG_EGL_ERROR(result, fmt, ...) LOG_ERROR(fmt ": %s\n", __VA_ARGS__ egl_strerror(result))
+    #define LOG_EGL_ERROR(result, fmt, ...) LOG_ERROR(fmt ": %s\n", __VA_ARGS__ egl_strerror(result))
 #endif
 
 #endif  // _FLUTTERPI_INCLUDE_EGL_H