Commit 067058ff authored by Sam Lantinga's avatar Sam Lantinga

Support the new 16-bit formats in SDL_MasksToPixelFormatEnum()

parent fdea37a7
...@@ -265,6 +265,12 @@ SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, ...@@ -265,6 +265,12 @@ SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask,
break; break;
case 16: case 16:
switch (Rmask) { switch (Rmask) {
case 0xF000:
return SDL_PIXELFORMAT_RGBA4444;
case 0x0F00:
return SDL_PIXELFORMAT_ARGB4444;
case 0x00F0:
return SDL_PIXELFORMAT_BGRA4444;
case 0x000F: case 0x000F:
return SDL_PIXELFORMAT_ABGR4444; return SDL_PIXELFORMAT_ABGR4444;
case 0x001F: case 0x001F:
...@@ -272,12 +278,13 @@ SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, ...@@ -272,12 +278,13 @@ SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask,
return SDL_PIXELFORMAT_BGR565; return SDL_PIXELFORMAT_BGR565;
} }
return SDL_PIXELFORMAT_ABGR1555; return SDL_PIXELFORMAT_ABGR1555;
case 0x0F00:
return SDL_PIXELFORMAT_ARGB4444;
case 0x7C00: case 0x7C00:
return SDL_PIXELFORMAT_ARGB1555; return SDL_PIXELFORMAT_ARGB1555;
case 0xF800: case 0xF800:
return SDL_PIXELFORMAT_RGB565; if (Gmask == 0x07E0) {
return SDL_PIXELFORMAT_RGB565;
}
return SDL_PIXELFORMAT_RGBA5551;
} }
break; break;
case 24: case 24:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment