Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to SDL3 #6234

Merged
merged 45 commits into from
Apr 9, 2024
Merged

Upgrade to SDL3 #6234

merged 45 commits into from
Apr 9, 2024

Commits on Apr 7, 2024

  1. Convert SDL2 usages to using static 

    This helps with migrating enums, as ClangSharp doesn't put them in the `SDL3` class.
    @Susko3
    Susko3 committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    392703f View commit details
    Browse the repository at this point in the history

  2. Run SDL build-scripits/rename_symbols.py 

    This renames SDL2 symbols to SDL3 names.
    @Susko3
    Susko3 committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    dc7ce4e View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. Switch to ppy.SDL3-CS and update usings

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    e936173 View commit details
    Browse the repository at this point in the history

  2. Convert to regular using (from using static)

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    4172d68 View commit details
    Browse the repository at this point in the history

  3. Update pointer types from IntPtr to specific ones 

    Also adds a bunch of `unsafe` /shrug
    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    95c9f57 View commit details
    Browse the repository at this point in the history

  4. Use UTF-8 literals and encoding when passing in strings

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    b3706de View commit details
    Browse the repository at this point in the history

  5. Use function pointers for callback functions 

    `WindowsMouseHandler` is not updated as it's on the chopping block.
    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    57112d0 View commit details
    Browse the repository at this point in the history

  6. Update display and window event types

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    efdd370 View commit details
    Browse the repository at this point in the history

  7. Use proper types

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    c473ac0 View commit details
    Browse the repository at this point in the history

  8. Update hint names

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    78ba63d View commit details
    Browse the repository at this point in the history

  9. Use fixed when passing in arrays

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    ce55edf View commit details
    Browse the repository at this point in the history

  10. Update to float mouse coordinates in pollMouse()

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    6302046 View commit details
    Browse the repository at this point in the history

  11. Simple function signature updates

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    66e8ea1 View commit details
    Browse the repository at this point in the history

  12. Remove manual Window raw mouse handling 

    This is done by SDL now, and the raw input event don't get reported by `SDL_SetWindowsMessageHook`.
    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    0923e41 View commit details
    Browse the repository at this point in the history

  13. Migrate SDL_SYSWMEVENT events to SDL_SetWindowsMessageHook() 

    https://github.com/libsdl-org/SDL/blob/e3395a75858373ddea040aca2ea210dff2dbead7/docs/README-migration.md?plain=1#L400-L401
    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    2fb51d0 View commit details
    Browse the repository at this point in the history

  14. Remove borderless fullscreen on non-Windows platforms 

    https://github.com/libsdl-org/SDL/blob/e3395a75858373ddea040aca2ea210dff2dbead7/docs/README-migration.md?plain=1#L1693
    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    0e78180 View commit details
    Browse the repository at this point in the history

  15. Simplify TryGetTouchName() logic

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    731a0dc View commit details
    Browse the repository at this point in the history

  16. Change DisplayMode.RefreshRate to float 

    Both osuTK and SDL3 use floats.
    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    eb734d2 View commit details
    Browse the repository at this point in the history

  17. Migrate displays + modes fetch to SDL3

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    b0830de View commit details
    Browse the repository at this point in the history

  18. Store display ID instead of index 

    Still doesn't fix all compile problems.
    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    6f8b5dc View commit details
    Browse the repository at this point in the history

  19. Get index from SDL_DisplayID

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    d19fa6e View commit details
    Browse the repository at this point in the history

  20. Update ensureWindowOnDisplay() logic and add helper to fetch display … 

    …at specific index
    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    47be5b6 View commit details
    Browse the repository at this point in the history

  21. Update tryFetchDisplayMode()

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    095a413 View commit details
    Browse the repository at this point in the history

  22. Update getClosestDisplayMode()

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    2e24e8f View commit details
    Browse the repository at this point in the history

  23. Use friendly helpers for getting strings from events

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    e27bfc5 View commit details
    Browse the repository at this point in the history

  24. Update touch event handling to use proper types

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    f2c1f28 View commit details
    Browse the repository at this point in the history

  25. Update joystick/gamepad event handling to use proper types

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    3a63be8 View commit details
    Browse the repository at this point in the history

  26. Use proper enum type in mouse button handling

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    91e50aa View commit details
    Browse the repository at this point in the history

  27. Migrate from SDL_GetWindowWMInfo() to window properties 

    https://github.com/libsdl-org/SDL/blob/main/docs/README-migration.md#sdl_syswmh
    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    1593e95 View commit details
    Browse the repository at this point in the history

  28. Comment out iOS code without migration path

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    45473dd View commit details
    Browse the repository at this point in the history

  29. Remove redundant casts and unsafe context

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    8fc1645 View commit details
    Browse the repository at this point in the history

  30. Update SDL2ControllerBindings

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    c731d0c View commit details
    Browse the repository at this point in the history

  31. Set DllImportResolver on iOS

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    40c1e41 View commit details
    Browse the repository at this point in the history

  32. Fix cursor not warping in fullscreen on Windows 

    This has regressed with a834f986fdba74e81aed2a76bef36f7ee30bb17d as SDL no longer
provides `SDL_SYSWMEVENT` and `SDL_SetWindowsMessageHook()` is not a 1:1 replacement.
    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    5ae8946 View commit details
    Browse the repository at this point in the history

  33. Remove custom DPI awareness code 

    SDL3 has proper support for HiDPI and does this for us.
    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    171920f View commit details
    Browse the repository at this point in the history

  34. Use type-friendly properties

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    dd51e3c View commit details
    Browse the repository at this point in the history

  35. Fix joystick axis not working

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    e9e73cb View commit details
    Browse the repository at this point in the history

  36. Don't convert float -> int -> float

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    d8e14e6 View commit details
    Browse the repository at this point in the history

  37. Rename osu.Framework.Platform.SDL2 to osu.Framework.Platform.SDL 

    `.SDL3` has a naming conflict with `SDL3` static class
    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    d16105a View commit details
    Browse the repository at this point in the history

  38. Rename classes from SDL2* to SDL3*

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    2ea78bb View commit details
    Browse the repository at this point in the history

  39. Replace SDL2 with SDL3 in comments / string literals

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    79d8e44 View commit details
    Browse the repository at this point in the history

  40. Remove native logic that supported raw mouse

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    668fa9c View commit details
    Browse the repository at this point in the history

  41. Fix code inspection

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    6b3a997 View commit details
    Browse the repository at this point in the history

  42. Enable NRT in SDL3Extensions

    @Susko3
    Susko3 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    22af688 View commit details
    Browse the repository at this point in the history

  43. Fix Vulkan+X11 not working

    @smoogipoo
    smoogipoo committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    d5af283 View commit details
    Browse the repository at this point in the history