Add test & fix for unusual pitch in surface.premul_alpha()
#2882
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
ankith26
reviewed
Jun 28, 2024
There was a problem hiding this comment.
IMHO, we don't need to make the sse2 version handle the unusual pitches, and probably should just fallback to the non-simd version.
As long as the avx2 and sse2 code can handle the pitch-is-multiple-of-bpp case, we should be good to go (and cover all real usecases?)
|
IG the same approach should probably be taken on all simd surface manipulations not just premul |
ankith26
reviewed
May 18, 2025
| @@ -2841,7 +2841,8 @@ premul_surf_color_by_alpha(SDL_Surface *src, SDL_Surface *dst) | |||
| // since we know dst is a copy of src we can simplify the normal checks | |||
| #if !defined(__EMSCRIPTEN__) | |||
| #if SDL_BYTEORDER == SDL_LIL_ENDIAN | |||
| if ((PG_SURF_BytesPerPixel(src) == 4) && pg_has_avx2()) { | |||
| if ((PG_SURF_BytesPerPixel(src) == 4) && | |||
| (src->pitch % PG_SURF_BytesPerPixel(src) == 0) && pg_has_avx2()) { | |||
There was a problem hiding this comment.
I think this test should be more robust. It should check for src->pitch == (src->w * PG_SURF_BytesPerPixel(src)) because I can imagine pitch may still be a multiple of bpp and not be equal to the minimal possible pitch.
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.
fixes #2750
From what I understand, these unusual, non-pixel aligned, surface pitches won't practically come up on any modern desktop systems (possibly no modern systems) so I prioritised fixing it for the least performance sensitive versions of this function - sse2 & the non-SIMD fallback. These are also the versions I originally wrote so I had a better idea of how they were supposed to work.
The basic fix is to add in the standard 'skip' value that is used in all the blitters to handle pitch issues between two different surfaces - usually these are pixel aligned. In the SSE2 case, to deal with the .5 of a pixel overlap in the pitch case we have to cast the skip value down to Uint8 to get to 'channel', or single byte, level of pointer incrementing as we only want to skip 2 channels worth of a pixel (2 bytes) rather than a whole pixel (4 bytes).
I think that makes sense anyway.
This probably needs feedback from @itzpr3d4t0r and @Starbuck5 to see if they think what I've changed makes sense and if we need to do anything else here.