Skip to content

Conversation

@yodel
Copy link
Contributor

@yodel yodel commented Nov 6, 2025

This reverts commit 7f7b1e6.

Specifically, it reverts the handling of the pixel format passed to SDL3_ConvertSurfaceAndColorspace inside of SDL_ConvertSurface so that the pixel format is derived by calling SDL3_GetPixelFormatForMasks instead of using the value from format->format.

Note, the other hunks from 7f7b1e6 were reverted in e47c7c7.

Resolves: #542

This reverts commit 7f7b1e6.

Specifically, it reverts the handling of the pixel format passed to
SDL3_ConvertSurfaceAndColorspace inside of SDL_ConvertSurface so that
the pixel format is derived by calling SDL3_GetPixelFormatForMasks
instead of using the value from format->format.

Note, the other hunks from 7f7b1e6 were reverted in e47c7c7.

Resolves: #542
Signed-off-by: Yodel Eldar <[email protected]>
@slouken slouken merged commit b799076 into libsdl-org:main Nov 6, 2025
8 checks passed
@slouken
Copy link
Collaborator

slouken commented Nov 6, 2025

This looks like the correct fix to me. SDL2 never looked at the pixel format so sdl2-compat shouldn't either.

I added a comment explaining why this was done. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

possible regression: Dwarf Fortress on Linux segfaults on invocation with 2.32.58

2 participants