Support the new 16-bit formats in SDL_MasksToPixelFormatEnum()

libsdl-org · Jan 12, 2011 · 5c8b5be · 5c8b5be
1 parent 2e10259
commit 5c8b5be
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/video/SDL_pixels.c b/src/video/SDL_pixels.c
@@ -265,19 +265,26 @@ SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask,
         break;
     case 16:
         switch (Rmask) {
+        case 0xF000:
+            return SDL_PIXELFORMAT_RGBA4444;
+        case 0x0F00:
+            return SDL_PIXELFORMAT_ARGB4444;
+        case 0x00F0:
+            return SDL_PIXELFORMAT_BGRA4444;
         case 0x000F:
             return SDL_PIXELFORMAT_ABGR4444;
         case 0x001F:
             if (Gmask == 0x07E0) {
                 return SDL_PIXELFORMAT_BGR565;
             }
             return SDL_PIXELFORMAT_ABGR1555;
-        case 0x0F00:
-            return SDL_PIXELFORMAT_ARGB4444;
         case 0x7C00:
             return SDL_PIXELFORMAT_ARGB1555;
         case 0xF800:
-            return SDL_PIXELFORMAT_RGB565;
+            if (Gmask == 0x07E0) {
+                return SDL_PIXELFORMAT_RGB565;
+            }
+            return SDL_PIXELFORMAT_RGBA5551;
         }
         break;
     case 24: