mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-03 16:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDL_ShouldIgnoreGamepad() should take product IDs rather than a guid.

Browse Source 
This lets us early out when scanning for new hardware more quickly.
This commit is contained in:
Sam Lantinga
2024-10-16 13:52:02 -07:00
parent 8a30def5f2
commit c41b2bb855
13 changed files with 42 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/joystick/SDL_joystick.c
View File

@@ -3236,24 +3236,19 @@ static SDL_JoystickType SDL_GetJoystickGUIDType(SDL_GUID guid)
return SDL_JOYSTICK_TYPE_UNKNOWN;
}
bool SDL_ShouldIgnoreJoystick(const char *name, SDL_GUID guid)
bool SDL_ShouldIgnoreJoystick(Uint16 vendor_id, Uint16 product_id, Uint16 version, const char *name)
{
Uint16 vendor;
Uint16 product;
SDL_GetJoystickGUIDInfo(guid, &vendor, &product, NULL, NULL);
// Check the joystick blacklist
if (SDL_VIDPIDInList(vendor, product, &blacklist_devices)) {
if (SDL_VIDPIDInList(vendor_id, product_id, &blacklist_devices)) {
return true;
}
if (!SDL_GetHintBoolean(SDL_HINT_JOYSTICK_ROG_CHAKRAM, false)) {
if (SDL_VIDPIDInList(vendor, product, &rog_gamepad_mice)) {
if (SDL_VIDPIDInList(vendor_id, product_id, &rog_gamepad_mice)) {
return true;
}
}
if (SDL_ShouldIgnoreGamepad(name, guid)) {
if (SDL_ShouldIgnoreGamepad(vendor_id, product_id, version, name)) {
return true;
}