From 482d964733e5ab42390a16bceff9f1ba3b750b95 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 5 Dec 2024 19:22:32 -0800
Subject: [PATCH] Don't filter out controllers when launched by Steam under
Proton
Fixes https://github.com/libsdl-org/SDL/issues/11579
Fixes https://github.com/libsdl-org/SDL/issues/12106
(cherry picked from commit 3060105cfa8e67dc47936274c63580a7adb2736d)
---
src/joystick/SDL_gamecontroller.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/joystick/SDL_gamecontroller.c b/src/joystick/SDL_gamecontroller.c
index fffc010411903..36e521eb956dc 100644
--- a/src/joystick/SDL_gamecontroller.c
+++ b/src/joystick/SDL_gamecontroller.c
@@ -2127,15 +2127,20 @@ SDL_bool SDL_ShouldIgnoreGameController(const char *name, SDL_JoystickGUID guid)
SDL_GetJoystickGUIDInfo(guid, &vendor, &product, &version, NULL);
#ifdef __WIN32__
- if (SDL_GetHintBoolean("SDL_GAMECONTROLLER_ALLOW_STEAM_VIRTUAL_GAMEPAD", SDL_FALSE)) {
- /* We're running under Steam and it will hide any controllers that we shouldn't open */
- return FALSE;
+ if (SDL_GetHintBoolean("SDL_GAMECONTROLLER_ALLOW_STEAM_VIRTUAL_GAMEPAD", SDL_FALSE) &&
+ SDL_GetHintBoolean("STEAM_COMPAT_PROTON", SDL_FALSE)) {
+ /* We are launched by Steam and running under Proton
+ * We can't tell whether this controller is a Steam Virtual Gamepad,
+ * so assume that Proton is doing the appropriate filtering of controllers
+ * and anything we see here is fine to use.
+ */
+ return SDL_FALSE;
}
-#else
+#endif // __WIN32__
+
if (SDL_IsJoystickSteamVirtualGamepad(vendor, product, version)) {
return !SDL_GetHintBoolean("SDL_GAMECONTROLLER_ALLOW_STEAM_VIRTUAL_GAMEPAD", SDL_FALSE);
}
-#endif
if (SDL_allowed_controllers.num_included_entries > 0) {
if (SDL_VIDPIDInList(vendor, product, &SDL_allowed_controllers)) {