gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bytes_per_pixel rename

Browse Source
This commit is contained in:
Isaac Aronson
2024-06-08 22:32:59 -05:00
committed by Sam Lantinga
parent 44d397282d
commit b7b513b70b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/SDL_blit_A.c
View File

@@ -1219,7 +1219,7 @@ SDL_BlitFunc SDL_CalculateBlitA(SDL_Surface *surface)
} }
case 2: case 2:
if (sf->BytesPerPixel == 4 && sf->Amask == 0xff000000 && sf->Gmask == 0xff00 && ((sf->Rmask == 0xff && df->Rmask == 0x1f) || (sf->Bmask == 0xff && df->Bmask == 0x1f))) { if (sf->bytes_per_pixel == 4 && sf->Amask == 0xff000000 && sf->Gmask == 0xff00 && ((sf->Rmask == 0xff && df->Rmask == 0x1f) || (sf->Bmask == 0xff && df->Bmask == 0x1f))) {
if (df->Gmask == 0x7e0) { if (df->Gmask == 0x7e0) {
return BlitARGBto565PixelAlpha; return BlitARGBto565PixelAlpha;
} else if (df->Gmask == 0x3e0) { } else if (df->Gmask == 0x3e0) {
@@ -1230,7 +1230,7 @@ SDL_BlitFunc SDL_CalculateBlitA(SDL_Surface *surface)
case 4: case 4:
#if defined(SDL_SSE4_1_INTRINSICS) || defined(SDL_AVX2_INTRINSICS) #if defined(SDL_SSE4_1_INTRINSICS) || defined(SDL_AVX2_INTRINSICS)
if (sf->BytesPerPixel == 4 && df->BytesPerPixel == 4 && (SDL_HasSSE41() || SDL_HasAVX2())) { if (sf->bytes_per_pixel == 4 && df->bytes_per_pixel == 4 && (SDL_HasSSE41() || SDL_HasAVX2())) {
return BlitNtoNPixelAlpha; return BlitNtoNPixelAlpha;
} }
#endif #endif

2
src/video/SDL_fillrect.c
View File

@@ -292,7 +292,7 @@ int SDL_FillSurfaceRects(SDL_Surface *dst, const SDL_Rect *rects, int count,
} }
if (fill_function == NULL) { if (fill_function == NULL) {
switch (dst->format->BytesPerPixel) { switch (dst->format->bytes_per_pixel) {
case 1: case 1:
{ {
color |= (color << 8); color |= (color << 8);