MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move axis count update out of GamepadThread - race condition

Browse Source
This commit is contained in:
Michael 2023-10-10 19:19:28 -04:00
parent 3028324634
commit e9dbf45f13
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rcore_drm.c
View File

@ -1948,6 +1948,11 @@ static void InitGamepad(void)
} }
ioctl(platform.gamepadStreamFd[i], JSIOCGNAME(64), &CORE.Input.Gamepad.name[i]); ioctl(platform.gamepadStreamFd[i], JSIOCGNAME(64), &CORE.Input.Gamepad.name[i]);
int axisCount = 0;
if (CORE.Input.Gamepad.ready[i]) ioctl(platform.gamepadStreamFd[i], JSIOCGAXES, &axisCount);
CORE.Input.Gamepad.axisCount = axisCount;
} }
} }
} }
@ -1969,17 +1974,10 @@ static void *GamepadThread(void *arg)
// Read gamepad event // Read gamepad event
struct js_event gamepadEvent = { 0 }; struct js_event gamepadEvent = { 0 };
int axisCount = 0;
while (!CORE.Window.shouldClose) while (!CORE.Window.shouldClose)
{ {
for (int i = 0; i < MAX_GAMEPADS; i++) for (int i = 0; i < MAX_GAMEPADS; i++)
{ {
// Update the axis count for each gamepad.
axisCount = 0;
if (CORE.Input.Gamepad.ready[i]) ioctl(platform.gamepadStreamFd[i], JSIOCGAXES, &axisCount);
CORE.Input.Gamepad.axisCount = axisCount;
if (read(platform.gamepadStreamFd[i], &gamepadEvent, sizeof(struct js_event)) == (int)sizeof(struct js_event)) if (read(platform.gamepadStreamFd[i], &gamepadEvent, sizeof(struct js_event)) == (int)sizeof(struct js_event))
{ {
gamepadEvent.type &= ~JS_EVENT_INIT; // Ignore synthetic events gamepadEvent.type &= ~JS_EVENT_INIT; // Ignore synthetic events