Mercurial > sdl-ios-xcode
diff test/common.c @ 4982:660d3a432102
Added some missing pixel formats and SDL_GetPixelFormatName()
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 12 Jan 2011 14:53:23 -0800 |
parents | aa8888658021 |
children | 686d795b1b29 |
line wrap: on
line diff
--- a/test/common.c Wed Jan 12 14:29:01 2011 -0800 +++ b/test/common.c Wed Jan 12 14:53:23 2011 -0800 @@ -11,58 +11,6 @@ #define AUDIO_USAGE \ "[--rate N] [--format U8|S8|U16|U16LE|U16BE|S16|S16LE|S16BE] [--channels N] [--samples N]" -struct pformat { - Uint32 id; - const char* idstr; -} pixel_format[]={ - {SDL_PIXELFORMAT_INDEX1LSB, "SDL_PIXELFORMAT_INDEX1LSB"}, - {SDL_PIXELFORMAT_INDEX1MSB, "SDL_PIXELFORMAT_INDEX1MSB"}, - {SDL_PIXELFORMAT_INDEX4LSB, "SDL_PIXELFORMAT_INDEX4LSB"}, - {SDL_PIXELFORMAT_INDEX4MSB, "SDL_PIXELFORMAT_INDEX4MSB"}, - {SDL_PIXELFORMAT_INDEX8, "SDL_PIXELFORMAT_INDEX8"}, - {SDL_PIXELFORMAT_RGB332, "SDL_PIXELFORMAT_RGB332"}, - {SDL_PIXELFORMAT_RGB444, "SDL_PIXELFORMAT_RGB444"}, - {SDL_PIXELFORMAT_RGB555, "SDL_PIXELFORMAT_RGB555"}, - {SDL_PIXELFORMAT_BGR555, "SDL_PIXELFORMAT_BGR555"}, - {SDL_PIXELFORMAT_ARGB4444, "SDL_PIXELFORMAT_ARGB4444"}, - {SDL_PIXELFORMAT_ABGR4444, "SDL_PIXELFORMAT_ABGR4444"}, - {SDL_PIXELFORMAT_ARGB1555, "SDL_PIXELFORMAT_ARGB1555"}, - {SDL_PIXELFORMAT_ABGR1555, "SDL_PIXELFORMAT_ABGR1555"}, - {SDL_PIXELFORMAT_RGB565, "SDL_PIXELFORMAT_RGB565"}, - {SDL_PIXELFORMAT_BGR565, "SDL_PIXELFORMAT_BGR565"}, - {SDL_PIXELFORMAT_RGB24, "SDL_PIXELFORMAT_RGB24"}, - {SDL_PIXELFORMAT_BGR24, "SDL_PIXELFORMAT_BGR24"}, - {SDL_PIXELFORMAT_RGB888, "SDL_PIXELFORMAT_RGB888"}, - {SDL_PIXELFORMAT_BGR888, "SDL_PIXELFORMAT_BGR888"}, - {SDL_PIXELFORMAT_ARGB8888, "SDL_PIXELFORMAT_ARGB8888"}, - {SDL_PIXELFORMAT_RGBA8888, "SDL_PIXELFORMAT_RGBA8888"}, - {SDL_PIXELFORMAT_ABGR8888, "SDL_PIXELFORMAT_ABGR8888"}, - {SDL_PIXELFORMAT_BGRA8888, "SDL_PIXELFORMAT_BGRA8888"}, - {SDL_PIXELFORMAT_ARGB2101010, "SDL_PIXELFORMAT_ARGB2101010"}, - {SDL_PIXELFORMAT_YV12, "SDL_PIXELFORMAT_YV12"}, - {SDL_PIXELFORMAT_IYUV, "SDL_PIXELFORMAT_IYUV"}, - {SDL_PIXELFORMAT_YUY2, "SDL_PIXELFORMAT_YUY2"}, - {SDL_PIXELFORMAT_UYVY, "SDL_PIXELFORMAT_UYVY"}, - {SDL_PIXELFORMAT_YVYU, "SDL_PIXELFORMAT_YVYU"} -}; - -const char* PixelFormatToString(Uint32 pformat) -{ - Uint32 it=0; - - do { - if (pixel_format[it].idstr == NULL) { - break; - } - if (pixel_format[it].id == pformat) { - return pixel_format[it].idstr; - } - it++; - } while(1); - - return "SDL_PIXELFORMAT_UNKNOWN"; -} - CommonState * CommonCreateState(char **argv, Uint32 flags) { @@ -719,7 +667,7 @@ fprintf(stderr, " Current mode: %dx%d@%dHz, %d bits-per-pixel (%s)\n", mode.w, mode.h, mode.refresh_rate, bpp, - PixelFormatToString(mode.format)); + SDL_GetPixelFormatName(mode.format)); if (Rmask || Gmask || Bmask) { fprintf(stderr, " Red Mask = 0x%.8x\n", Rmask); fprintf(stderr, " Green Mask = 0x%.8x\n", Gmask); @@ -741,7 +689,7 @@ fprintf(stderr, " Mode %d: %dx%d@%dHz, %d bits-per-pixel (%s)\n", j, mode.w, mode.h, mode.refresh_rate, bpp, - PixelFormatToString(mode.format)); + SDL_GetPixelFormatName(mode.format)); if (Rmask || Gmask || Bmask) { fprintf(stderr, " Red Mask = 0x%.8x\n", Rmask);