A few surface.c SDL3 fixes #3344
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
damusss
reviewed
Feb 22, 2025
| if (!PG_GetSurfaceClipRect(surf, &clip_rect)) { | ||
| return RAISE(pgExc_SDLError, SDL_GetError()); | ||
| } | ||
|
|
||
| SDL_Rect surf_rect = {0, 0, surf->w, surf->h}; | ||
|
|
||
| // In SDL3, SDL_IntersectRect is renamed to SDL_GetRectIntersection |
There was a problem hiding this comment.
Following this comment, should branching be made to use the correct name? should a macro be made? There are roughly 6 usages of this function in the codebase, in pygame._sdl2 aswell.
I guess you didn't change it here because it is out of scope from surface-only related fixes, do you plan on fixing it in another PR?
There was a problem hiding this comment.
It's probably covered by SDL_ENABLE_OLD_NAMES already.
There was a problem hiding this comment.
It is covered by old names, yes.
damusss
approved these changes
Feb 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is more low hanging fruit towards porting surface.c to SDL3.
The remaining complex things in this file are
I have patches staged that get those items to compile as well, but they are more complex or provisional (in the case of RLEACCEL). So I will open them in future PRs.