Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-10-23 07:35:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libretro: Use bitmasks for input

Browse source
This commit is contained in:
Connor McLaughlin 2020-08-19 00:41:34 +10:00
parent e1c29510f1
commit f704cc64c3
2 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/duckstation-libretro/libretro_host_interface.cpp
View file

@ -66,9 +66,18 @@ LibretroHostInterface::~LibretroHostInterface()
void LibretroHostInterface::InitInterfaces() void LibretroHostInterface::InitInterfaces()
{ {
SetCoreOptions(); SetCoreOptions();
InitLogging();
InitDiskControlInterface(); InitDiskControlInterface();
if (!m_interfaces_initialized)
{
InitLogging();
InitRumbleInterface(); InitRumbleInterface();
unsigned dummy = 0;
m_supports_input_bitmasks = g_retro_environment_callback(RETRO_ENVIRONMENT_GET_INPUT_BITMASKS, &dummy);
m_interfaces_initialized = true;
}
} }
void LibretroHostInterface::InitLogging() void LibretroHostInterface::InitLogging()
@ -711,11 +720,20 @@ void LibretroHostInterface::UpdateControllersDigitalController(u32 index)
{DigitalController::Button::R1, RETRO_DEVICE_ID_JOYPAD_R}, {DigitalController::Button::R1, RETRO_DEVICE_ID_JOYPAD_R},
{DigitalController::Button::R2, RETRO_DEVICE_ID_JOYPAD_R2}}}; {DigitalController::Button::R2, RETRO_DEVICE_ID_JOYPAD_R2}}};
if (m_supports_input_bitmasks)
{
const u16 active = g_retro_input_state_callback(index, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_MASK);
for (const auto& it : mapping)
controller->SetButtonState(it.first, (active & (static_cast<u16>(1u) << it.second)) != 0u);
}
else
{
for (const auto& it : mapping) for (const auto& it : mapping)
{ {
const int16_t state = g_retro_input_state_callback(index, RETRO_DEVICE_JOYPAD, 0, it.second); const int16_t state = g_retro_input_state_callback(index, RETRO_DEVICE_JOYPAD, 0, it.second);
controller->SetButtonState(it.first, state != 0); controller->SetButtonState(it.first, state != 0);
} }
}
} }
void LibretroHostInterface::UpdateControllersAnalogController(u32 index) void LibretroHostInterface::UpdateControllersAnalogController(u32 index)
@ -747,11 +765,20 @@ void LibretroHostInterface::UpdateControllersAnalogController(u32 index)
{AnalogController::Axis::RightX, {RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X}}, {AnalogController::Axis::RightX, {RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X}},
{AnalogController::Axis::RightY, {RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y}}}}; {AnalogController::Axis::RightY, {RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y}}}};
if (m_supports_input_bitmasks)
{
const u16 active = g_retro_input_state_callback(index, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_MASK);
for (const auto& it : button_mapping)
controller->SetButtonState(it.first, (active & (static_cast<u16>(1u) << it.second)) != 0u);
}
else
{
for (const auto& it : button_mapping) for (const auto& it : button_mapping)
{ {
const int16_t state = g_retro_input_state_callback(index, RETRO_DEVICE_JOYPAD, 0, it.second); const int16_t state = g_retro_input_state_callback(index, RETRO_DEVICE_JOYPAD, 0, it.second);
controller->SetButtonState(it.first, state != 0); controller->SetButtonState(it.first, state != 0);
} }
}
for (const auto& it : axis_mapping) for (const auto& it : axis_mapping)
{ {

2
src/duckstation-libretro/libretro_host_interface.h
View file

@ -92,6 +92,8 @@ private:
retro_rumble_interface m_rumble_interface = {}; retro_rumble_interface m_rumble_interface = {};
bool m_rumble_interface_valid = false; bool m_rumble_interface_valid = false;
bool m_supports_input_bitmasks = false;
bool m_interfaces_initialized = false;
}; };
extern LibretroHostInterface g_libretro_host_interface; extern LibretroHostInterface g_libretro_host_interface;