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

Improved support for byte array pixel formats

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/15082
This commit is contained in:
Sam Lantinga
2026-02-21 12:51:26 -08:00
parent 21e10b2e76
commit 4f06087b36
1 changed files with 86 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/video/SDL_pixels.c
View File

@@ -259,7 +259,11 @@ bool SDL_GetMasksForPixelFormat(SDL_PixelFormat format, int *bpp, Uint32 *Rmask,
} }
*Rmask = *Gmask = *Bmask = *Amask = 0; *Rmask = *Gmask = *Bmask = *Amask = 0;
if (format == SDL_PIXELFORMAT_RGB24) { if (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_ARRAYU8) {
switch (SDL_BYTESPERPIXEL(format)) {
case 3:
switch (SDL_PIXELORDER(format)) {
case SDL_ARRAYORDER_RGB:
#if SDL_BYTEORDER == SDL_BIG_ENDIAN #if SDL_BYTEORDER == SDL_BIG_ENDIAN
*Rmask = 0x00FF0000; *Rmask = 0x00FF0000;
*Gmask = 0x0000FF00; *Gmask = 0x0000FF00;
@@ -270,19 +274,83 @@ bool SDL_GetMasksForPixelFormat(SDL_PixelFormat format, int *bpp, Uint32 *Rmask,
*Bmask = 0x00FF0000; *Bmask = 0x00FF0000;
#endif #endif
return true; return true;
case SDL_ARRAYORDER_BGR:
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
*Rmask = 0x000000FF;
*Gmask = 0x0000FF00;
*Bmask = 0x00FF0000;
#else
*Rmask = 0x00FF0000;
*Gmask = 0x0000FF00;
*Bmask = 0x000000FF;
#endif
return true;
default:
break;
} }
break;
if (format == SDL_PIXELFORMAT_BGR24) { case 4:
switch (SDL_PIXELORDER(format)) {
case SDL_ARRAYORDER_RGBA:
#if SDL_BYTEORDER == SDL_BIG_ENDIAN #if SDL_BYTEORDER == SDL_BIG_ENDIAN
*Rmask = 0xFF000000;
*Gmask = 0x00FF0000;
*Bmask = 0x0000FF00;
*Amask = 0x000000FF;
#else
*Rmask = 0x000000FF; *Rmask = 0x000000FF;
*Gmask = 0x0000FF00; *Gmask = 0x0000FF00;
*Bmask = 0x00FF0000; *Bmask = 0x00FF0000;
*Amask = 0xFF000000;
#endif
return true;
case SDL_ARRAYORDER_ARGB:
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
*Rmask = 0x00FF0000;
*Gmask = 0x0000FF00;
*Bmask = 0x000000FF;
*Amask = 0xFF000000;
#else
*Rmask = 0x0000FF00;
*Gmask = 0x00FF0000;
*Bmask = 0xFF000000;
*Amask = 0x000000FF;
#endif
return true;
case SDL_ARRAYORDER_BGRA:
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
*Rmask = 0x0000FF00;
*Gmask = 0x00FF0000;
*Bmask = 0xFF000000;
*Amask = 0x000000FF;
#else #else
*Rmask = 0x00FF0000; *Rmask = 0x00FF0000;
*Gmask = 0x0000FF00; *Gmask = 0x0000FF00;
*Bmask = 0x000000FF; *Bmask = 0x000000FF;
*Amask = 0xFF000000;
#endif #endif
return true; return true;
case SDL_ARRAYORDER_ABGR:
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
*Rmask = 0x000000FF;
*Gmask = 0x0000FF00;
*Bmask = 0x00FF0000;
*Amask = 0xFF000000;
#else
*Rmask = 0xFF000000;
*Gmask = 0x00FF0000;
*Bmask = 0x0000FF00;
*Amask = 0x000000FF;
#endif
return true;
default:
break;
}
break;
default:
break;
}
return SDL_SetError("Unknown pixel format");
} }
if (SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED8 && if (SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED8 &&