Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-02-06 02:02:09 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed the NVIDIA SHIELD Controller showing up twice on macOS

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/14911
This commit is contained in:
Sam Lantinga
2026-01-27 13:52:06 -08:00
parent 72343b9ee2
commit 1fe6bf4982
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/joystick/apple/SDL_mfijoystick.m
View File

@@ -162,6 +162,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"]) {
@@ -343,6 +350,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);
@@ -354,6 +362,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, "")) ||
@@ -492,7 +501,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
src/joystick/apple/SDL_mfijoystick_c.h
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;