[gamemode] extra win/lin/macos fixes

Signed-off-by: lizzie <lizzie@eden-emu.dev>

CMakeLists.txt

@@ -474,7 +474,7 @@ else()
         find_package(Catch2 3.0.1 REQUIRED)
     endif()
 
-    if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR ANDROID)
+    if (PLATFORM_LINUX OR ANDROID)
         find_package(gamemode 1.7 MODULE)
     endif()
 

externals/CMakeLists.txt

@@ -179,7 +179,7 @@ if (ANDROID AND ARCHITECTURE_arm64)
     AddJsonPackage(libadrenotools)
 endif()
 
-if (UNIX AND NOT APPLE AND NOT TARGET gamemode::headers)
+if (NOT TARGET gamemode::headers)
     add_library(gamemode INTERFACE)
     target_include_directories(gamemode INTERFACE gamemode)
     add_library(gamemode::headers ALIAS gamemode)

externals/gamemode/gamemode_client.h

@@ -1,6 +1,9 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 /*
 
-Copyright (c) 2017-2019, Feral Interactive
+Copyright (c) 2017-2025, Feral Interactive and the GameMode contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -103,6 +106,7 @@ typedef int (*api_call_pid_return_int)(pid_t);
 static api_call_return_int REAL_internal_gamemode_request_start = NULL;
 static api_call_return_int REAL_internal_gamemode_request_end = NULL;
 static api_call_return_int REAL_internal_gamemode_query_status = NULL;
+static api_call_return_int REAL_internal_gamemode_request_restart = NULL;
 static api_call_return_cstring REAL_internal_gamemode_error_string = NULL;
 static api_call_pid_return_int REAL_internal_gamemode_request_start_for = NULL;
 static api_call_pid_return_int REAL_internal_gamemode_request_end_for = NULL;
@@ -166,6 +170,10 @@ __attribute__((always_inline)) static inline int internal_load_libgamemode(void)
 		  (void **)&REAL_internal_gamemode_query_status,
 		  sizeof(REAL_internal_gamemode_query_status),
 		  false },
+		{ "real_gamemode_request_restart",
+		  (void **)&REAL_internal_gamemode_request_restart,
+		  sizeof(REAL_internal_gamemode_request_restart),
+		  false },
 		{ "real_gamemode_error_string",
 		  (void **)&REAL_internal_gamemode_error_string,
 		  sizeof(REAL_internal_gamemode_error_string),
@@ -319,6 +327,24 @@ __attribute__((always_inline)) static inline int gamemode_query_status(void)
 	return REAL_internal_gamemode_query_status();
 }
 
+/* Redirect to the real libgamemode */
+__attribute__((always_inline)) static inline int gamemode_request_restart(void)
+{
+	/* Need to load gamemode */
+	if (internal_load_libgamemode() < 0) {
+		return -1;
+	}
+
+	if (REAL_internal_gamemode_request_restart == NULL) {
+		snprintf(internal_gamemode_client_error_string,
+		         sizeof(internal_gamemode_client_error_string),
+		         "gamemode_request_restart missing (older host?)");
+		return -1;
+	}
+
+	return REAL_internal_gamemode_request_restart();
+}
+
 /* Redirect to the real libgamemode */
 __attribute__((always_inline)) static inline int gamemode_request_start_for(pid_t pid)
 {

src/common/CMakeLists.txt

@@ -69,6 +69,8 @@ add_library(
   fs/fs_util.h
   fs/path_util.cpp
   fs/path_util.h
+  gamemode.cpp
+  gamemode.h
   hash.h
   heap_tracker.cpp
   heap_tracker.h
@@ -191,11 +193,7 @@ if(ANDROID)
            android/applets/software_keyboard.h)
 endif()
 
-if(LINUX AND NOT APPLE)
-  target_sources(common PRIVATE linux/gamemode.cpp linux/gamemode.h)
-
-  target_link_libraries(common PRIVATE gamemode::headers)
-endif()
+target_link_libraries(common PRIVATE gamemode::headers)
 
 if(ARCHITECTURE_x86_64)
   target_sources(

src/common/gamemode.cpp

@@ -0,0 +1,50 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// While technically available on al *NIX platforms, Linux is only available
+// as the primary target of libgamemode.so - so warnings are suppressed
+#ifdef __unix__
+#include <gamemode_client.h>
+#endif
+#include "common/gamemode.h"
+#include "common/logging/log.h"
+#include "common/settings.h"
+
+namespace Common::FeralGamemode {
+
+void Start() noexcept {
+    if (Settings::values.enable_gamemode) {
+#ifdef __unix__
+        if (gamemode_request_start() < 0) {
+#ifdef __linux__
+            LOG_WARNING(Frontend, "{}", gamemode_error_string());
+#else
+            LOG_INFO(Frontend, "{}", gamemode_error_string());
+#endif
+        } else {
+            LOG_INFO(Frontend, "Done");
+        }
+#endif
+    }
+}
+
+void Stop() noexcept {
+    if (Settings::values.enable_gamemode) {
+#ifdef __unix__
+        if (gamemode_request_end() < 0) {
+#ifdef __linux__
+            LOG_WARNING(Frontend, "{}", gamemode_error_string());
+#else
+            LOG_INFO(Frontend, "{}", gamemode_error_string());
+#endif
+        } else {
+            LOG_INFO(Frontend, "Done");
+        }
+#endif
+    }
+}
+
+} // namespace Common::Linux

src/common/gamemode.h

@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+namespace Common::FeralGamemode {
+
+/// @brief Start the gamemode client
+void Start() noexcept;
+
+/// @brief Stop the gmemode client
+void Stop() noexcept;
+
+} // namespace Common::FeralGamemode

src/common/linux/gamemode.cpp

@@ -1,40 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <gamemode_client.h>
-
-#include "common/linux/gamemode.h"
-#include "common/logging/log.h"
-#include "common/settings.h"
-
-namespace Common::Linux {
-
-void StartGamemode() {
-    if (Settings::values.enable_gamemode) {
-        if (gamemode_request_start() < 0) {
-            LOG_WARNING(Frontend, "Failed to start gamemode: {}", gamemode_error_string());
-        } else {
-            LOG_INFO(Frontend, "Started gamemode");
-        }
-    }
-}
-
-void StopGamemode() {
-    if (Settings::values.enable_gamemode) {
-        if (gamemode_request_end() < 0) {
-            LOG_WARNING(Frontend, "Failed to stop gamemode: {}", gamemode_error_string());
-        } else {
-            LOG_INFO(Frontend, "Stopped gamemode");
-        }
-    }
-}
-
-void SetGamemodeState(bool state) {
-    if (state) {
-        StartGamemode();
-    } else {
-        StopGamemode();
-    }
-}
-
-} // namespace Common::Linux

src/common/linux/gamemode.h

@@ -1,24 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-namespace Common::Linux {
-
-/**
- * Start the (Feral Interactive) Linux gamemode if it is installed and it is activated
- */
-void StartGamemode();
-
-/**
- * Stop the (Feral Interactive) Linux gamemode if it is installed and it is activated
- */
-void StopGamemode();
-
-/**
- * Start or stop the (Feral Interactive) Linux gamemode if it is installed and it is activated
- * @param state The new state the gamemode should have
- */
-void SetGamemodeState(bool state);
-
-} // namespace Common::Linux

src/common/settings.cpp

@@ -163,8 +163,9 @@ bool IsFastmemEnabled() {
     }
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun__)
     return false;
-#endif
+#else
     return true;
+#endif
 }
 
 static bool is_nce_enabled = false;

src/yuzu/main.cpp

@@ -21,9 +21,7 @@
 #include <csignal>
 #include <sys/socket.h>
 #endif
-#ifdef __linux__
-#include "common/linux/gamemode.h"
-#endif
+#include "common/gamemode.h"
 
 #include <boost/container/flat_set.hpp>
 
@@ -426,10 +424,7 @@ GMainWindow::GMainWindow(bool has_broken_vulkan)
 #ifdef __unix__
     SetupSigInterrupts();
 #endif
-
-#ifdef __linux__
     SetGamemodeEnabled(Settings::values.enable_gamemode.GetValue());
-#endif
 
     UISettings::RestoreWindowState(config);
 
@@ -2388,9 +2383,7 @@ void GMainWindow::OnEmulationStopped() {
 
     discord_rpc->Update();
 
-#ifdef __linux__
-    Common::Linux::StopGamemode();
-#endif
+    Common::FeralGamemode::Stop();
 
     // The emulation is stopped, so closing the window or not does not matter anymore
     disconnect(render_window, &GRenderWindow::Closed, this, &GMainWindow::OnStopGame);
@@ -3573,10 +3566,7 @@ void GMainWindow::OnStartGame() {
     play_time_manager->Start();
 
     discord_rpc->Update();
-
-#ifdef __linux__
-    Common::Linux::StartGamemode();
-#endif
+    Common::FeralGamemode::Start();
 }
 
 void GMainWindow::OnRestartGame() {
@@ -3597,10 +3587,7 @@ void GMainWindow::OnPauseGame() {
     play_time_manager->Stop();
     UpdateMenuState();
     AllowOSSleep();
-
-#ifdef __linux__
-    Common::Linux::StopGamemode();
-#endif
+    Common::FeralGamemode::Stop();
 }
 
 void GMainWindow::OnPauseContinueGame() {
@@ -3895,9 +3882,7 @@ void GMainWindow::OnConfigure() {
     const auto old_theme = UISettings::values.theme;
     const bool old_discord_presence = UISettings::values.enable_discord_presence.GetValue();
     const auto old_language_index = Settings::values.language_index.GetValue();
-#ifdef __linux__
     const bool old_gamemode = Settings::values.enable_gamemode.GetValue();
-#endif
 
     Settings::SetConfiguringGlobal(true);
     ConfigureDialog configure_dialog(this, hotkey_registry, input_subsystem.get(),
@@ -3957,11 +3942,9 @@ void GMainWindow::OnConfigure() {
     if (UISettings::values.enable_discord_presence.GetValue() != old_discord_presence) {
         SetDiscordEnabled(UISettings::values.enable_discord_presence.GetValue());
     }
-#ifdef __linux__
     if (Settings::values.enable_gamemode.GetValue() != old_gamemode) {
         SetGamemodeEnabled(Settings::values.enable_gamemode.GetValue());
     }
-#endif
 
     if (!multiplayer_state->IsHostingPublicRoom()) {
         multiplayer_state->UpdateCredentials();
@@ -5570,13 +5553,15 @@ void GMainWindow::SetDiscordEnabled([[maybe_unused]] bool state) {
     discord_rpc->Update();
 }
 
-#ifdef __linux__
 void GMainWindow::SetGamemodeEnabled(bool state) {
     if (emulation_running) {
-        Common::Linux::SetGamemodeState(state);
+        if (state) {
+            Common::FeralGamemode::Start();
+        } else {
+            Common::FeralGamemode::Stop();
+        }
     }
 }
-#endif
 
 void GMainWindow::changeEvent(QEvent* event) {
 #ifdef __unix__
@@ -5740,7 +5725,7 @@ int main(int argc, char* argv[]) {
     chdir(Common::FS::PathToUTF8String(bin_path).c_str());
 #endif
 
-#ifdef __linux__
+#ifdef __unix__
     // Set the DISPLAY variable in order to open web browsers
     // TODO (lat9nq): Find a better solution for AppImages to start external applications
     if (QString::fromLocal8Bit(qgetenv("DISPLAY")).isEmpty()) {

src/yuzu_cmd/yuzu.cpp

@@ -63,10 +63,7 @@ __declspec(dllexport) unsigned long NvOptimusEnablement = 0x00000001;
 __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
 }
 #endif
-
-#ifdef __linux__
-#include "common/linux/gamemode.h"
-#endif
+#include "common/gamemode.h"
 
 static void PrintHelp(const char* argv0) {
     std::cout << "Usage: " << argv0
@@ -435,10 +432,7 @@ int main(int argc, char** argv) {
         // Just exit right away.
         exit(0);
     });
-
-#ifdef __linux__
-    Common::Linux::StartGamemode();
-#endif
+    Common::FeralGamemode::Start();
 
     void(system.Run());
     if (system.DebuggerEnabled()) {
@@ -450,11 +444,7 @@ int main(int argc, char** argv) {
     system.DetachDebugger();
     void(system.Pause());
     system.ShutdownMainProcess();
-
-#ifdef __linux__
-    Common::Linux::StopGamemode();
-#endif
-
+    Common::FeralGamemode::Stop();
     detached_tasks.WaitForAllTasks();
     return 0;
 }