mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

xinput_joypad_poll - make UWP codepath leading

Browse Source
This commit is contained in:
twinaphex 2020-07-20 03:35:52 +02:00
parent abd3365a34
commit 0e9a86816e
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
input/drivers_joypad/xinput_joypad.c
View File

@ -577,26 +577,15 @@ static void xinput_joypad_poll(void)
for (i = 0; i < 4; ++i) for (i = 0; i < 4; ++i)
{ {
#ifdef HAVE_DINPUT
if (g_xinput_states[i].connected)
{
if (g_XInputGetStateEx(i,
&(g_xinput_states[i].xstate))
== ERROR_DEVICE_NOT_CONNECTED)
{
g_xinput_states[i].connected = false;
input_autoconfigure_disconnect(i, xinput_joypad_name(i));
}
}
#else
/* Normally, dinput handles device insertion/removal for us, but
* since dinput is not available on UWP we have to do it ourselves */
/* Also note that on UWP, the controllers are not available on startup
* and are instead 'plugged in' a moment later because Microsoft reasons */
/* TODO: This may be bad for performance? */
bool new_connected = g_XInputGetStateEx(i, &(g_xinput_states[i].xstate)) != ERROR_DEVICE_NOT_CONNECTED; bool new_connected = g_XInputGetStateEx(i, &(g_xinput_states[i].xstate)) != ERROR_DEVICE_NOT_CONNECTED;
if (new_connected != g_xinput_states[i].connected) if (new_connected != g_xinput_states[i].connected)
{ {
#ifndef HAVE_DINPUT
/* Normally, dinput handles device insertion/removal for us, but
* since dinput is not available on UWP we have to do it ourselves */
/* Also note that on UWP, the controllers are not available on startup
* and are instead 'plugged in' a moment later because Microsoft reasons */
/* TODO: This may be bad for performance? */
if (new_connected) if (new_connected)
{ {
/* This is kinda ugly, but it's the same thing that dinput does */ /* This is kinda ugly, but it's the same thing that dinput does */
@ -604,12 +593,11 @@ static void xinput_joypad_poll(void)
xinput_joypad_init(NULL); xinput_joypad_init(NULL);
return; return;
} }
#endif
g_xinput_states[i].connected = new_connected; g_xinput_states[i].connected = new_connected;
if (!g_xinput_states[i].connected) if (!g_xinput_states[i].connected)
input_autoconfigure_disconnect(i, xinput_joypad_name(i)); input_autoconfigure_disconnect(i, xinput_joypad_name(i));
} }
#endif
} }
#ifdef HAVE_DINPUT #ifdef HAVE_DINPUT