RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-03-09 23:14:46 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update codebase to SDL 3.4.0

Browse source
This commit is contained in:
Megamouse 2026-01-05 12:58:23 +01:00
parent 4fd2409b8b
commit 69384d7bb4
3 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/Io/LogitechG27.h
View file

@ -38,10 +38,7 @@ struct logitech_g27_ffb_slot
logitech_g27_ffb_state state = logitech_g27_ffb_state::inactive;
u64 last_update = 0;
SDL_HapticEffect last_effect {};
// TODO switch to SDL_HapticEffectID when it becomes available in a future SDL release
// Match the return of SDL_CreateHapticEffect for now
int effect_id = -1;
SDL_HapticEffectID effect_id = -1;
};
struct sdl_mapping

9
rpcs3/Input/sdl_camera_handler.cpp
View file

@ -10,15 +10,6 @@
LOG_CHANNEL(camera_log, "Camera");
#if !(SDL_VERSION_ATLEAST(3, 4, 0))
namespace SDL_CameraPermissionState
{
constexpr int SDL_CAMERA_PERMISSION_STATE_DENIED = -1;
constexpr int SDL_CAMERA_PERMISSION_STATE_PENDING = 0;
constexpr int SDL_CAMERA_PERMISSION_STATE_APPROVED = 1;
}
#endif
template <>
void fmt_class_string<SDL_CameraSpec>::format(std::string& out, u64 arg)
{

4
rpcs3/Input/sdl_instance.cpp
View file

@ -102,8 +102,8 @@ bool sdl_instance::initialize_impl()
set_hint(SDL_HINT_JOYSTICK_HIDAPI_PS3, "1");
#endif
// Disable LG4FF driver on windows (only needed for SDL 3.4.0)
#if _WIN32 && SDL_VERSION_ATLEAST(3, 4, 0)
// Disable LG4FF driver on windows
#if _WIN32
set_hint(SDL_HINT_JOYSTICK_HIDAPI_LG4FF, "0");
#endif