SDL3

[Pentarctagon]

---

Some initial work seeing what moving to SDL3 will take. The first commit is from running the recommended rename_* scripts from https://github.com/libsdl-org/SDL/blob/main/docs/README-migration.md. Second commit is simpler things I was able to easily fix - main thing with this was more things are taking floats instead of ints as arguments.

[Wedge009]

This sounds interesting. Unfortunate that there's breaking changes for SDL_RWops. Might this help with SDL dependencies for things like #6826?

[Pentarctagon]

The minimum requirement for that one is only 2.0.18, so this wouldn't really be relevant for that PR.

[gfgtdf]

It seems a bit odd to me that the script changes for example __APPLE__ to SDL_PLATFORM_APPLE since i thought __APPLE__ is provided by the compiler and not by sdl, i might be wrong though.

About "SDL_RWops": iirc the main reason why they were needed in the first place was to support non-utf-8 filepaths for windows 7 (especially for some bug in sdl-mixer that called different version of the windows api). Since it seemed like we mostly dropped support for windows 7, we can in the worst case also just skip the SDL_RWOps part and use the "normal" api the takes paths.

[Pentarctagon]

The normal API being what's in filesystem.cpp?

[gfgtdf]

The normal API being what's in filesystem.cpp?

The normal api being IMG_Load instead of IMG_Load_RW , Mix_LoadMUSinstead of Mix_LoadMUSType_RW etc.

[Pentarctagon]

Ah, alright. Looks like the new ones are Mix_LoadWAV_IO, IMG_Load_IO, etc. So like:
IMG_Load_IO(SDL_IOFromFile(ovr_file.c_str(), "rb"), true);

[gfgtdf]

I guess that works too, i don't really see the advntage of that though.

[Pentarctagon]

It has an argument for whether to close the file before it returns with the data, which is probably a good thing to do (and the current functions all set that argument to true).

[Pentarctagon]

Got it compiling, though it's pretty broken at the moment too.

[Wedge009]

Broken how? Things not displaying properly?

[Pentarctagon]

It seems mostly input related actually - tooltips only display for a split second after your mouse moves rather than for the entire duration the mouse is hovering over the element, the help can be opened, but it's impossible to click anything in it other than the Close button, scrolling around the map doesn't work, etc.

[Pentarctagon]

Got the input fixed. So yeah, at this point it seems like everything is working. Looked in-game, in the editor, went online, looked at the list of add-ons in the add-ons manager, and it all worked and looked like expected.

[gfgtdf]

I still think the change from __APPLE__ to SDL_PLATFORM_APPLE is most likely wrong, in many cases (server/, utils/ ) i don't even know how they compile since they afaik don't depend on sdl

[Pentarctagon]

Well, it'd just mean that the macro isn't defined, which by itself wouldn't cause a build failure. Trying to compile code for the wrong platform obviously might, but I don't have a macOS machine and CI can't run until there's actually an SDL3 release made available on the various platforms.

[Pentarctagon]

Oh, also, there's this bit of Windows-specific code that I'm not sure what to do with:
10db633#diff-b482f066a3f38e67254db02f4d28fb308a5adaf2ebda24427ed8fc86a4ef84dfR691-R692

The non-Windows bit was removed since the function it calls is empty anyway, but on Windows it actually does something.

[Wedge009]

Did you set-up SDL3 manually? Looks like my distribution doesn't package sdl3 yet.

[Pentarctagon]

Yes - SDL3, SDL3_image, and SDL3_mixer. The latter two don't actually have any sort of release yet either - I just took the current code from their git repository.