Merge 4c4452c9e5 into 62f814999f

.github/workflows/flatpak.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ["23.08", "24.08"]
+        version: ["23.08", "24.08", "25.08"]
     container:
       image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-${{ matrix.version }}
       options: --privileged

.github/workflows/flatpak_ci.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ["23.08", "24.08"]
+        version: ["23.08", "24.08", "25.08"]
     container:
       image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-${{ matrix.version }}
       options: --privileged

flatpak/gay.pancake.lsfg-vk-ui.yml

@@ -3,7 +3,7 @@ command: lsfg-vk-ui
 default-branch: develop
 
 runtime: org.gnome.Platform
-runtime-version: '48'
+runtime-version: '49'
 sdk: org.gnome.Sdk
 
 finish-args:

flatpak/org.freedesktop.Platform.VulkanLayer.lsfgvk_25.08.yml

@@ -0,0 +1,30 @@
+id: org.freedesktop.Platform.VulkanLayer.lsfgvk
+default-branch: develop
+
+runtime: org.freedesktop.Platform
+runtime-version: '25.08'
+sdk: org.freedesktop.Sdk
+branch: '25.08'
+build-extension: true
+
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.llvm21
+
+build-options:
+  prefix: /usr/lib/extensions/vulkan/lsfgvk
+  append-path: /usr/lib/sdk/llvm21/bin
+  prepend-ld-library-path: /usr/lib/sdk/llvm21/lib
+
+modules:
+  - name: lsfg-vk
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_C_COMPILER=clang
+      - -DCMAKE_CXX_COMPILER=clang++
+      - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On
+    sources:
+      - type: dir
+        path: ..
+      - type: patch
+        path: VkLayer_LS_frame_generation.patch

src/config/config.cpp

@@ -26,6 +26,11 @@ using namespace Config;
 GlobalConfiguration Config::globalConf{};
 std::optional<GameConfiguration> Config::currentConf{};
 
+extern "C" __attribute__((visibility("default")))
+void lsfg_get_active_conf(Configuration *cfg) {
+    *cfg = Config::activeConf;
+}
+
 namespace {
     /// Turn a string into a VkPresentModeKHR enum value.
     VkPresentModeKHR into_present(const std::string& mode) {