more pedantic fixes

Author: ardera

CMakeLists.txt

@@ -145,6 +145,7 @@ add_library(
   src/dmabuf_surface.c
   src/frame_scheduler.c
   src/window.c
+  src/vulkan.c
   src/dummy_render_surface.c
   src/plugins/services.c
 )

CMakePresets.json

@@ -7,17 +7,58 @@
             "description": "Sets Ninja generator, build and install directory",
             "generator": "Ninja",
             "binaryDir": "${sourceDir}/out/build/${presetName}",
+            "hidden": true,
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug",
                 "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
+                "TRY_ENABLE_OPENGL": false,
                 "ENABLE_OPENGL": true,
+                "TRY_ENABLE_VULKAN": false,
+                "ENABLE_VULKAN": true,
+                "BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN": true,
+                "TRY_BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN": false,
                 "BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN": true,
+                "TRY_BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN": false,
                 "BUILD_SENTRY_PLUGIN": true,
-                "ENABLE_TESTS": true,
+                "ENABLE_TESTS": true
+            }
+        },
+        {
+            "name": "default-clang",
+            "displayName": "Default OpenGL host build (clang)",
+            "description": "Sets Ninja generator, build and install directory",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/out/build/${presetName}",
+            "inherits": "default",
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "clang",
+                "CMAKE_CXX_COMPILER": "clang++"
+            }
+        },
+        {
+            "name": "default-clang-20",
+            "displayName": "Default OpenGL host build (clang-20)",
+            "description": "Sets Ninja generator, build and install directory",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/out/build/${presetName}",
+            "inherits": "default",
+            "cacheVariables": {
                 "CMAKE_C_COMPILER": "clang-20",
                 "CMAKE_CXX_COMPILER": "clang++-20"
             }
         },
+        {
+            "name": "default-gcc",
+            "displayName": "Default OpenGL host build (gcc)",
+            "description": "Sets Ninja generator, build and install directory",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/out/build/${presetName}",
+            "inherits": "default",
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "gcc",
+                "CMAKE_CXX_COMPILER": "g++"
+            }
+        },
         {
             "name": "cross-aarch64-default",
             "displayName": "OpenGL AArch64 cross-build",

src/flutter-pi.c

@@ -394,7 +394,8 @@ static void *proc_resolver(void *userdata, const char *name) {
     flutterpi = userdata;
     ASSERT_NOT_NULL(flutterpi->gl_renderer);
 
-    return (void *) gl_renderer_get_proc_address(flutterpi->gl_renderer, name);
+    fn_ptr_t fn = gl_renderer_get_proc_address(flutterpi->gl_renderer, name);
+    return *((void **) &fn);
 }
 #endif
 
@@ -408,7 +409,8 @@ UNUSED static void *on_get_vulkan_proc_address(void *userdata, FlutterVulkanInst
         name = "vkGetInstanceProcAddr";
     }
 
-    return (void *) vkGetInstanceProcAddr((VkInstance) instance, name);
+    PFN_vkVoidFunction fn = vkGetInstanceProcAddr((VkInstance) instance, name);
+    return *(void **) (&fn);
 #else
     (void) userdata;
     (void) instance;
@@ -1170,13 +1172,15 @@ typedef FlutterEngineResult (*flutter_engine_get_proc_addresses_t)(FlutterEngine
 static int get_flutter_engine_procs(void *engine_handle, FlutterEngineProcTable *procs_out) {
     FlutterEngineResult engine_result;
 
-    flutter_engine_get_proc_addresses_t get_proc_addresses = (flutter_engine_get_proc_addresses_t
-    ) dlsym(engine_handle, "FlutterEngineGetProcAddresses");
-    if (get_proc_addresses == NULL) {
+    void *fn = dlsym(engine_handle, "FlutterEngineGetProcAddresses");
+    if (fn == NULL) {
         LOG_ERROR("Could not resolve flutter engine function FlutterEngineGetProcAddresses.\n");
         return EINVAL;
     }
 
+    flutter_engine_get_proc_addresses_t get_proc_addresses;
+    *((void **) &get_proc_addresses) = fn;
+
     procs_out->struct_size = sizeof(FlutterEngineProcTable);
     engine_result = get_proc_addresses(procs_out);
     if (engine_result != kSuccess) {

src/gl_renderer.c

@@ -63,16 +63,15 @@ struct gl_renderer {
 };
 
 static fn_ptr_t try_get_proc_address(const char *name) {
-    fn_ptr_t address;
-
-    address = eglGetProcAddress(name);
-    if (address) {
-        return address;
+    fn_ptr_t fn = eglGetProcAddress(name);
+    if (fn) {
+        return fn;
     }
 
-    address = (fn_ptr_t) dlsym(RTLD_DEFAULT, name);
-    if (address) {
-        return address;
+    void *void_fn = dlsym(RTLD_DEFAULT, name);
+    if (void_fn) {
+        *((void **) &fn) = void_fn;
+        return fn;
     }
 
     return (fn_ptr_t) NULL;