godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Fix Nvidia Shield controller showing up twice on macOS

This commit is contained in:
Nintorch 2026-01-28 19:51:48 +05:00
parent 77579f93e6
commit 6efc73fb02
4 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
thirdparty/README.md vendored
View File

@ -992,6 +992,7 @@ Patches:
- `0004-errno-include.patch` ([GH-108354](https://github.com/godotengine/godot/pull/108354))
- `0005-fix-libudev-dbus.patch` ([GH-108373](https://github.com/godotengine/godot/pull/108373))
- `0006-fix-cs-environ.patch` ([GH-109283](https://github.com/godotengine/godot/pull/109283))
- `0007-shield-duplicate-macos.patch` ([GH-115510](https://github.com/godotengine/godot/pull/115510))
## spirv-cross

11
thirdparty/sdl/joystick/apple/SDL_mfijoystick.m vendored
View File

@ -158,6 +158,13 @@ static bool IsControllerSwitchJoyConPair(GCController *controller)
}
return false;
}
static bool IsControllerNVIDIASHIELD(GCController *controller)
{
if ([controller.vendorName hasPrefix:@"NVIDIA Controller"]) {
return true;
}
return false;
}
static bool IsControllerStadia(GCController *controller)
{
if ([controller.vendorName hasPrefix:@"Stadia"]) {
@ -339,6 +346,7 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
device->is_ps5 = IsControllerPS5(controller);
device->is_switch_pro = IsControllerSwitchPro(controller);
device->is_switch_joycon_pair = IsControllerSwitchJoyConPair(controller);
device->is_shield = IsControllerNVIDIASHIELD(controller);
device->is_stadia = IsControllerStadia(controller);
device->is_backbone_one = IsControllerBackboneOne(controller);
device->is_switch_joyconL = IsControllerSwitchJoyConL(controller);
@ -350,6 +358,7 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
(device->is_ps5 && HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_PS5)) ||
(device->is_switch_pro && HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO)) ||
(device->is_switch_joycon_pair && HIDAPI_IsDevicePresent(USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH_JOYCON_PAIR, 0, "")) ||
(device->is_shield && HIDAPI_IsDevicePresent(USB_VENDOR_NVIDIA, USB_PRODUCT_NVIDIA_SHIELD_CONTROLLER_V104, 0, "")) ||
(device->is_stadia && HIDAPI_IsDevicePresent(USB_VENDOR_GOOGLE, USB_PRODUCT_GOOGLE_STADIA_CONTROLLER, 0, "")) ||
(device->is_switch_joyconL && HIDAPI_IsDevicePresent(USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH_JOYCON_LEFT, 0, "")) ||
(device->is_switch_joyconR && HIDAPI_IsDevicePresent(USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH_JOYCON_RIGHT, 0, ""))) {
@ -486,7 +495,7 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
subtype = 4;
#ifdef DEBUG_CONTROLLER_PROFILE
NSLog(@"Elements used:\n", controller.vendorName);
NSLog(@"Elements used:\n");
for (id key in device->buttons) {
NSLog(@"\tButton: %@ (%s)\n", key, elements[key].analog ? "analog" : "digital");
}

1
thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h vendored
View File

@ -53,6 +53,7 @@ typedef struct joystick_hwdata
bool is_switch_joycon_pair;
bool is_switch_joyconL;
bool is_switch_joyconR;
bool is_shield;
bool is_stadia;
bool is_backbone_one;
int is_siri_remote;

55
thirdparty/sdl/patches/0007-shield-duplicate-macos.patch vendored Normal file
View File

@ -0,0 +1,55 @@
diff --git a/thirdparty/sdl/joystick/apple/SDL_mfijoystick.m b/thirdparty/sdl/joystick/apple/SDL_mfijoystick.m
index 48e9051798..3e8f4a8bab 100644
--- a/thirdparty/sdl/joystick/apple/SDL_mfijoystick.m
+++ b/thirdparty/sdl/joystick/apple/SDL_mfijoystick.m
@@ -158,6 +158,13 @@ static bool IsControllerSwitchJoyConPair(GCController *controller)
}
return false;
}
+static bool IsControllerNVIDIASHIELD(GCController *controller)
+{
+ if ([controller.vendorName hasPrefix:@"NVIDIA Controller"]) {
+ return true;
+ }
+ return false;
+}
static bool IsControllerStadia(GCController *controller)
{
if ([controller.vendorName hasPrefix:@"Stadia"]) {
@@ -339,6 +346,7 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
device->is_ps5 = IsControllerPS5(controller);
device->is_switch_pro = IsControllerSwitchPro(controller);
device->is_switch_joycon_pair = IsControllerSwitchJoyConPair(controller);
+ device->is_shield = IsControllerNVIDIASHIELD(controller);
device->is_stadia = IsControllerStadia(controller);
device->is_backbone_one = IsControllerBackboneOne(controller);
device->is_switch_joyconL = IsControllerSwitchJoyConL(controller);
@@ -350,6 +358,7 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
(device->is_ps5 && HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_PS5)) ||
(device->is_switch_pro && HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO)) ||
(device->is_switch_joycon_pair && HIDAPI_IsDevicePresent(USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH_JOYCON_PAIR, 0, "")) ||
+ (device->is_shield && HIDAPI_IsDevicePresent(USB_VENDOR_NVIDIA, USB_PRODUCT_NVIDIA_SHIELD_CONTROLLER_V104, 0, "")) ||
(device->is_stadia && HIDAPI_IsDevicePresent(USB_VENDOR_GOOGLE, USB_PRODUCT_GOOGLE_STADIA_CONTROLLER, 0, "")) ||
(device->is_switch_joyconL && HIDAPI_IsDevicePresent(USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH_JOYCON_LEFT, 0, "")) ||
(device->is_switch_joyconR && HIDAPI_IsDevicePresent(USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH_JOYCON_RIGHT, 0, ""))) {
@@ -486,7 +495,7 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
subtype = 4;
#ifdef DEBUG_CONTROLLER_PROFILE
- NSLog(@"Elements used:\n", controller.vendorName);
+ NSLog(@"Elements used:\n");
for (id key in device->buttons) {
NSLog(@"\tButton: %@ (%s)\n", key, elements[key].analog ? "analog" : "digital");
}
diff --git a/thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h b/thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h
index 783b3f488c..dfa7615964 100644
--- a/thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h
+++ b/thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h
@@ -53,6 +53,7 @@ typedef struct joystick_hwdata
bool is_switch_joycon_pair;
bool is_switch_joyconL;
bool is_switch_joyconR;
+ bool is_shield;
bool is_stadia;
bool is_backbone_one;
int is_siri_remote;