dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-06-03 14:14:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix yet another input regression in some Unity games (#4480)

Browse Source 
* Set dummy GameController's m_connected to false

* Remove this check and handle it differently

* Save one reverse lookup on a map
this is mostly irrelevant on performance

* i have no clue so let's just log stuff

* apparently this is the correct default

* swap this to debug logging

* the loathsome clang-formatter
This commit is contained in:
kalaposfos13 2026-05-26 17:54:16 +02:00 committed by GitHub
parent 0f094cb6c8
commit 2b5aa0b1c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/libraries/pad/pad.cpp
View File

@ -42,20 +42,6 @@ static u64 pad_handle_counter = 1;
static std::unordered_map<HandleKey, s32, HandleKeyHash> pad_handle_map{}; static std::unordered_map<HandleKey, s32, HandleKeyHash> pad_handle_map{};
static std::unordered_map<s32, GameController*> handle_to_controller_map{}; static std::unordered_map<s32, GameController*> handle_to_controller_map{};
static std::optional<HandleKey> FindHandleKeyByHandle(s32 handle) {
for (const auto& [key, value] : pad_handle_map) {
if (value == handle) {
return key;
}
}
return std::nullopt;
}
static bool IsUnavailableSpecialHandle(const std::optional<HandleKey>& handle_key) {
return handle_key.has_value() && handle_key->device_class == ORBIS_PAD_PORT_TYPE_SPECIAL &&
!EmulatorSettings.IsUsingSpecialPad();
}
int PS4_SYSV_ABI scePadClose(s32 handle) { int PS4_SYSV_ABI scePadClose(s32 handle) {
LOG_WARNING(Lib_Pad, "called, handle: {}", handle); LOG_WARNING(Lib_Pad, "called, handle: {}", handle);
if (handle_to_controller_map.erase(handle) == 0) { if (handle_to_controller_map.erase(handle) == 0) {
@ -151,13 +137,10 @@ int PS4_SYSV_ABI scePadGetControllerInformation(s32 handle, OrbisPadControllerIn
if (it == handle_to_controller_map.end()) { if (it == handle_to_controller_map.end()) {
return ORBIS_PAD_ERROR_INVALID_HANDLE; return ORBIS_PAD_ERROR_INVALID_HANDLE;
} }
const auto handle_key = FindHandleKeyByHandle(handle);
bool connected = false; bool connected = false;
int connected_count = 0; int connected_count = 0;
Input::State state{}; Input::State state{};
if (!IsUnavailableSpecialHandle(handle_key)) { it->second->ReadState(&state, &connected, &connected_count);
it->second->ReadState(&state, &connected, &connected_count);
}
std::memset(pInfo, 0, sizeof(OrbisPadControllerInformation)); std::memset(pInfo, 0, sizeof(OrbisPadControllerInformation));
pInfo->touchPadInfo.pixelDensity = 1; pInfo->touchPadInfo.pixelDensity = 1;
@ -167,14 +150,15 @@ int PS4_SYSV_ABI scePadGetControllerInformation(s32 handle, OrbisPadControllerIn
pInfo->stickInfo.deadZoneRight = 1; pInfo->stickInfo.deadZoneRight = 1;
pInfo->connectionType = ORBIS_PAD_CONNECTION_TYPE_LOCAL; pInfo->connectionType = ORBIS_PAD_CONNECTION_TYPE_LOCAL;
pInfo->connectedCount = static_cast<u8>(std::clamp(connected_count, 0, 0xff)); pInfo->connectedCount = static_cast<u8>(std::clamp(connected_count, 0, 0xff));
pInfo->deviceClass = OrbisPadDeviceClass::Invalid; pInfo->deviceClass = OrbisPadDeviceClass::Standard;
pInfo->connected = connected; pInfo->connected = connected;
if (handle_key.has_value() && handle_key->device_class == ORBIS_PAD_PORT_TYPE_STANDARD) { if (connected) {
pInfo->deviceClass = OrbisPadDeviceClass::Standard; pInfo->deviceClass = EmulatorSettings.IsUsingSpecialPad()
} else if (handle_key.has_value() && handle_key->device_class == ORBIS_PAD_PORT_TYPE_SPECIAL && ? (OrbisPadDeviceClass)EmulatorSettings.GetSpecialPadClass()
EmulatorSettings.IsUsingSpecialPad()) { : OrbisPadDeviceClass::Standard;
pInfo->deviceClass = (OrbisPadDeviceClass)EmulatorSettings.GetSpecialPadClass();
} }
LOG_DEBUG(Lib_Pad, "c: {} cc: {}, ct: {}, dc: {}", pInfo->connected, pInfo->connectedCount,
pInfo->connectionType, std::to_underlying(pInfo->deviceClass));
return ORBIS_OK; return ORBIS_OK;
} }

5
src/input/controller.h
View File

@ -178,7 +178,10 @@ class GameControllers {
public: public:
GameControllers() GameControllers()
: controllers({new GameController(), new GameController(), new GameController(), : controllers({new GameController(), new GameController(), new GameController(),
new GameController(), new GameController()}) {}; new GameController(), new GameController()}) {
controllers[4]->m_connected = false;
controllers[4]->m_connected_count = 0;
};
virtual ~GameControllers() = default; virtual ~GameControllers() = default;
GameController* operator[](const size_t& i) const { GameController* operator[](const size_t& i) const {
if (i > 4) { if (i > 4) {