From 8f0198e82efc1cec31b0474d723a77c333024bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Fri, 25 Jun 2021 19:49:38 +0200 Subject: [PATCH] Remove errors for gamepad element mismatch Because there are controllers in the wild using the same hardware ID despite having different numbers of buttons and axes, an error message was triggered that was only expected for a corrupted mapping database. This removes the error for now, in preparation for better error handling for gamepad mappings overall. Fixes #1763. (cherry picked from commit 6876cf8d7e0e70dc3e4d7b0224d08312c9f78099) --- README.md | 2 ++ src/input.c | 12 ------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 3c8dbccf..3ee222ab 100644 --- a/README.md +++ b/README.md @@ -119,6 +119,8 @@ information on what to include when reporting a bug. ## Changelog - Bugfix: Buffers were swapped at creation on single-buffered windows (#1873) + - Bugfix: Gamepad mapping updates could spam `GLFW_INVALID_VALUE` due to + incompatible controllers sharing hardware ID (#1763) - [Win32] Bugfix: `USE_MSVC_RUNTIME_LIBRARY_DLL` had no effect on CMake 3.15 or later (#1783,#1796) - [Win32] Bugfix: Compilation with LLVM for Windows failed (#1807,#1824,#1874) diff --git a/src/input.c b/src/input.c index 56277ca4..20b7c412 100644 --- a/src/input.c +++ b/src/input.c @@ -85,25 +85,13 @@ static _GLFWmapping* findValidMapping(const _GLFWjoystick* js) for (i = 0; i <= GLFW_GAMEPAD_BUTTON_LAST; i++) { if (!isValidElementForJoystick(mapping->buttons + i, js)) - { - _glfwInputError(GLFW_INVALID_VALUE, - "Invalid button in gamepad mapping %s (%s)", - mapping->guid, - mapping->name); return NULL; - } } for (i = 0; i <= GLFW_GAMEPAD_AXIS_LAST; i++) { if (!isValidElementForJoystick(mapping->axes + i, js)) - { - _glfwInputError(GLFW_INVALID_VALUE, - "Invalid axis in gamepad mapping %s (%s)", - mapping->guid, - mapping->name); return NULL; - } } }