geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch stderr output to SDL_Log() so it shows up on Windows and mobile devices

Sam Lantinga 2017-01-31 10:19:56 -08:00
parent 4e3fa7b9d4
commit 800a72eb17
1 changed files with 89 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
src/test/SDL_test_common.c
View File

@ -467,13 +467,13 @@ SDLTest_PrintRendererFlag(Uint32 flag)
{ {
switch (flag) { switch (flag) {
case SDL_RENDERER_PRESENTVSYNC: case SDL_RENDERER_PRESENTVSYNC:
fprintf(stderr, "PresentVSync"); SDL_Log("PresentVSync");
break; break;
case SDL_RENDERER_ACCELERATED: case SDL_RENDERER_ACCELERATED:
fprintf(stderr, "Accelerated"); SDL_Log("Accelerated");
break; break;
default: default:
fprintf(stderr, "0x%8.8x", flag); SDL_Log("0x%8.8x", flag);
break; break;
} }
} }
@ -483,103 +483,103 @@ SDLTest_PrintPixelFormat(Uint32 format)
{ {
switch (format) { switch (format) {
case SDL_PIXELFORMAT_UNKNOWN: case SDL_PIXELFORMAT_UNKNOWN:
fprintf(stderr, "Unknwon"); SDL_Log("Unknwon");
break; break;
case SDL_PIXELFORMAT_INDEX1LSB: case SDL_PIXELFORMAT_INDEX1LSB:
fprintf(stderr, "Index1LSB"); SDL_Log("Index1LSB");
break; break;
case SDL_PIXELFORMAT_INDEX1MSB: case SDL_PIXELFORMAT_INDEX1MSB:
fprintf(stderr, "Index1MSB"); SDL_Log("Index1MSB");
break; break;
case SDL_PIXELFORMAT_INDEX4LSB: case SDL_PIXELFORMAT_INDEX4LSB:
fprintf(stderr, "Index4LSB"); SDL_Log("Index4LSB");
break; break;
case SDL_PIXELFORMAT_INDEX4MSB: case SDL_PIXELFORMAT_INDEX4MSB:
fprintf(stderr, "Index4MSB"); SDL_Log("Index4MSB");
break; break;
case SDL_PIXELFORMAT_INDEX8: case SDL_PIXELFORMAT_INDEX8:
fprintf(stderr, "Index8"); SDL_Log("Index8");
break; break;
case SDL_PIXELFORMAT_RGB332: case SDL_PIXELFORMAT_RGB332:
fprintf(stderr, "RGB332"); SDL_Log("RGB332");
break; break;
case SDL_PIXELFORMAT_RGB444: case SDL_PIXELFORMAT_RGB444:
fprintf(stderr, "RGB444"); SDL_Log("RGB444");
break; break;
case SDL_PIXELFORMAT_RGB555: case SDL_PIXELFORMAT_RGB555:
fprintf(stderr, "RGB555"); SDL_Log("RGB555");
break; break;
case SDL_PIXELFORMAT_BGR555: case SDL_PIXELFORMAT_BGR555:
fprintf(stderr, "BGR555"); SDL_Log("BGR555");
break; break;
case SDL_PIXELFORMAT_ARGB4444: case SDL_PIXELFORMAT_ARGB4444:
fprintf(stderr, "ARGB4444"); SDL_Log("ARGB4444");
break; break;
case SDL_PIXELFORMAT_ABGR4444: case SDL_PIXELFORMAT_ABGR4444:
fprintf(stderr, "ABGR4444"); SDL_Log("ABGR4444");
break; break;
case SDL_PIXELFORMAT_ARGB1555: case SDL_PIXELFORMAT_ARGB1555:
fprintf(stderr, "ARGB1555"); SDL_Log("ARGB1555");
break; break;
case SDL_PIXELFORMAT_ABGR1555: case SDL_PIXELFORMAT_ABGR1555:
fprintf(stderr, "ABGR1555"); SDL_Log("ABGR1555");
break; break;
case SDL_PIXELFORMAT_RGB565: case SDL_PIXELFORMAT_RGB565:
fprintf(stderr, "RGB565"); SDL_Log("RGB565");
break; break;
case SDL_PIXELFORMAT_BGR565: case SDL_PIXELFORMAT_BGR565:
fprintf(stderr, "BGR565"); SDL_Log("BGR565");
break; break;
case SDL_PIXELFORMAT_RGB24: case SDL_PIXELFORMAT_RGB24:
fprintf(stderr, "RGB24"); SDL_Log("RGB24");
break; break;
case SDL_PIXELFORMAT_BGR24: case SDL_PIXELFORMAT_BGR24:
fprintf(stderr, "BGR24"); SDL_Log("BGR24");
break; break;
case SDL_PIXELFORMAT_RGB888: case SDL_PIXELFORMAT_RGB888:
fprintf(stderr, "RGB888"); SDL_Log("RGB888");
break; break;
case SDL_PIXELFORMAT_BGR888: case SDL_PIXELFORMAT_BGR888:
fprintf(stderr, "BGR888"); SDL_Log("BGR888");
break; break;
case SDL_PIXELFORMAT_ARGB8888: case SDL_PIXELFORMAT_ARGB8888:
fprintf(stderr, "ARGB8888"); SDL_Log("ARGB8888");
break; break;
case SDL_PIXELFORMAT_RGBA8888: case SDL_PIXELFORMAT_RGBA8888:
fprintf(stderr, "RGBA8888"); SDL_Log("RGBA8888");
break; break;
case SDL_PIXELFORMAT_ABGR8888: case SDL_PIXELFORMAT_ABGR8888:
fprintf(stderr, "ABGR8888"); SDL_Log("ABGR8888");
break; break;
case SDL_PIXELFORMAT_BGRA8888: case SDL_PIXELFORMAT_BGRA8888:
fprintf(stderr, "BGRA8888"); SDL_Log("BGRA8888");
break; break;
case SDL_PIXELFORMAT_ARGB2101010: case SDL_PIXELFORMAT_ARGB2101010:
fprintf(stderr, "ARGB2101010"); SDL_Log("ARGB2101010");
break; break;
case SDL_PIXELFORMAT_YV12: case SDL_PIXELFORMAT_YV12:
fprintf(stderr, "YV12"); SDL_Log("YV12");
break; break;
case SDL_PIXELFORMAT_IYUV: case SDL_PIXELFORMAT_IYUV:
fprintf(stderr, "IYUV"); SDL_Log("IYUV");
break; break;
case SDL_PIXELFORMAT_YUY2: case SDL_PIXELFORMAT_YUY2:
fprintf(stderr, "YUY2"); SDL_Log("YUY2");
break; break;
case SDL_PIXELFORMAT_UYVY: case SDL_PIXELFORMAT_UYVY:
fprintf(stderr, "UYVY"); SDL_Log("UYVY");
break; break;
case SDL_PIXELFORMAT_YVYU: case SDL_PIXELFORMAT_YVYU:
fprintf(stderr, "YVYU"); SDL_Log("YVYU");
break; break;
case SDL_PIXELFORMAT_NV12: case SDL_PIXELFORMAT_NV12:
fprintf(stderr, "NV12"); SDL_Log("NV12");
break; break;
case SDL_PIXELFORMAT_NV21: case SDL_PIXELFORMAT_NV21:
fprintf(stderr, "NV21"); SDL_Log("NV21");
break; break;
default: default:
fprintf(stderr, "0x%8.8x", format); SDL_Log("0x%8.8x", format);
break; break;
} }
} }
@ -589,34 +589,34 @@ SDLTest_PrintRenderer(SDL_RendererInfo * info)
{ {
int i, count; int i, count;
fprintf(stderr, " Renderer %s:\n", info->name); SDL_Log(" Renderer %s:\n", info->name);
fprintf(stderr, " Flags: 0x%8.8X", info->flags); SDL_Log(" Flags: 0x%8.8X", info->flags);
fprintf(stderr, " ("); SDL_Log(" (");
count = 0; count = 0;
for (i = 0; i < sizeof(info->flags) * 8; ++i) { for (i = 0; i < sizeof(info->flags) * 8; ++i) {
Uint32 flag = (1 << i); Uint32 flag = (1 << i);
if (info->flags & flag) { if (info->flags & flag) {
if (count > 0) { if (count > 0) {
fprintf(stderr, " | "); SDL_Log(" | ");
} }
SDLTest_PrintRendererFlag(flag); SDLTest_PrintRendererFlag(flag);
++count; ++count;
} }
} }
fprintf(stderr, ")\n"); SDL_Log(")\n");
fprintf(stderr, " Texture formats (%d): ", info->num_texture_formats); SDL_Log(" Texture formats (%d): ", info->num_texture_formats);
for (i = 0; i < (int) info->num_texture_formats; ++i) { for (i = 0; i < (int) info->num_texture_formats; ++i) {
if (i > 0) { if (i > 0) {
fprintf(stderr, ", "); SDL_Log(", ");
} }
SDLTest_PrintPixelFormat(info->texture_formats[i]); SDLTest_PrintPixelFormat(info->texture_formats[i]);
} }
fprintf(stderr, "\n"); SDL_Log("\n");
if (info->max_texture_width || info->max_texture_height) { if (info->max_texture_width || info->max_texture_height) {
fprintf(stderr, " Max Texture Size: %dx%d\n", SDL_Log(" Max Texture Size: %dx%d\n",
info->max_texture_width, info->max_texture_height); info->max_texture_width, info->max_texture_height);
} }
} }
@ -629,7 +629,7 @@ SDLTest_LoadIcon(const char *file)
/* Load the icon surface */ /* Load the icon surface */
icon = SDL_LoadBMP(file); icon = SDL_LoadBMP(file);
if (icon == NULL) { if (icon == NULL) {
fprintf(stderr, "Couldn't load %s: %s\n", file, SDL_GetError()); SDL_Log("Couldn't load %s: %s\n", file, SDL_GetError());
return (NULL); return (NULL);
} }
@ -651,25 +651,25 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
if (state->verbose & VERBOSE_VIDEO) { if (state->verbose & VERBOSE_VIDEO) {
n = SDL_GetNumVideoDrivers(); n = SDL_GetNumVideoDrivers();
if (n == 0) { if (n == 0) {
fprintf(stderr, "No built-in video drivers\n"); SDL_Log("No built-in video drivers\n");
} else { } else {
fprintf(stderr, "Built-in video drivers:"); SDL_Log("Built-in video drivers:");
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
if (i > 0) { if (i > 0) {
fprintf(stderr, ","); SDL_Log(",");
} }
fprintf(stderr, " %s", SDL_GetVideoDriver(i)); SDL_Log(" %s", SDL_GetVideoDriver(i));
} }
fprintf(stderr, "\n"); SDL_Log("\n");
} }
} }
if (SDL_VideoInit(state->videodriver) < 0) { if (SDL_VideoInit(state->videodriver) < 0) {
fprintf(stderr, "Couldn't initialize video driver: %s\n", SDL_Log("Couldn't initialize video driver: %s\n",
SDL_GetError()); SDL_GetError());
return SDL_FALSE; return SDL_FALSE;
} }
if (state->verbose & VERBOSE_VIDEO) { if (state->verbose & VERBOSE_VIDEO) {
fprintf(stderr, "Video driver: %s\n", SDL_Log("Video driver: %s\n",
SDL_GetCurrentVideoDriver()); SDL_GetCurrentVideoDriver());
} }
@ -715,53 +715,50 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
int outputIndex = 0; int outputIndex = 0;
#endif #endif
n = SDL_GetNumVideoDisplays(); n = SDL_GetNumVideoDisplays();
fprintf(stderr, "Number of displays: %d\n", n); SDL_Log("Number of displays: %d\n", n);
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
fprintf(stderr, "Display %d: %s\n", i, SDL_GetDisplayName(i)); SDL_Log("Display %d: %s\n", i, SDL_GetDisplayName(i));
SDL_zero(bounds); SDL_zero(bounds);
SDL_GetDisplayBounds(i, &bounds); SDL_GetDisplayBounds(i, &bounds);
fprintf(stderr, "Bounds: %dx%d at %d,%d\n", bounds.w, bounds.h, bounds.x, bounds.y); SDL_Log("Bounds: %dx%d at %d,%d\n", bounds.w, bounds.h, bounds.x, bounds.y);
SDL_GetDesktopDisplayMode(i, &mode); SDL_GetDesktopDisplayMode(i, &mode);
SDL_PixelFormatEnumToMasks(mode.format, &bpp, &Rmask, &Gmask, SDL_PixelFormatEnumToMasks(mode.format, &bpp, &Rmask, &Gmask,
&Bmask, &Amask); &Bmask, &Amask);
fprintf(stderr, SDL_Log(" Current mode: %dx%d@%dHz, %d bits-per-pixel (%s)\n",
" Current mode: %dx%d@%dHz, %d bits-per-pixel (%s)\n",
mode.w, mode.h, mode.refresh_rate, bpp, mode.w, mode.h, mode.refresh_rate, bpp,
SDL_GetPixelFormatName(mode.format)); SDL_GetPixelFormatName(mode.format));
if (Rmask || Gmask || Bmask) { if (Rmask || Gmask || Bmask) {
fprintf(stderr, " Red Mask = 0x%.8x\n", Rmask); SDL_Log(" Red Mask = 0x%.8x\n", Rmask);
fprintf(stderr, " Green Mask = 0x%.8x\n", Gmask); SDL_Log(" Green Mask = 0x%.8x\n", Gmask);
fprintf(stderr, " Blue Mask = 0x%.8x\n", Bmask); SDL_Log(" Blue Mask = 0x%.8x\n", Bmask);
if (Amask) if (Amask)
fprintf(stderr, " Alpha Mask = 0x%.8x\n", Amask); SDL_Log(" Alpha Mask = 0x%.8x\n", Amask);
} }
/* Print available fullscreen video modes */ /* Print available fullscreen video modes */
m = SDL_GetNumDisplayModes(i); m = SDL_GetNumDisplayModes(i);
if (m == 0) { if (m == 0) {
fprintf(stderr, "No available fullscreen video modes\n"); SDL_Log("No available fullscreen video modes\n");
} else { } else {
fprintf(stderr, " Fullscreen video modes:\n"); SDL_Log(" Fullscreen video modes:\n");
for (j = 0; j < m; ++j) { for (j = 0; j < m; ++j) {
SDL_GetDisplayMode(i, j, &mode); SDL_GetDisplayMode(i, j, &mode);
SDL_PixelFormatEnumToMasks(mode.format, &bpp, &Rmask, SDL_PixelFormatEnumToMasks(mode.format, &bpp, &Rmask,
&Gmask, &Bmask, &Amask); &Gmask, &Bmask, &Amask);
fprintf(stderr, SDL_Log(" Mode %d: %dx%d@%dHz, %d bits-per-pixel (%s)\n",
" Mode %d: %dx%d@%dHz, %d bits-per-pixel (%s)\n",
j, mode.w, mode.h, mode.refresh_rate, bpp, j, mode.w, mode.h, mode.refresh_rate, bpp,
SDL_GetPixelFormatName(mode.format)); SDL_GetPixelFormatName(mode.format));
if (Rmask || Gmask || Bmask) { if (Rmask || Gmask || Bmask) {
fprintf(stderr, " Red Mask = 0x%.8x\n", SDL_Log(" Red Mask = 0x%.8x\n",
Rmask); Rmask);
fprintf(stderr, " Green Mask = 0x%.8x\n", SDL_Log(" Green Mask = 0x%.8x\n",
Gmask); Gmask);
fprintf(stderr, " Blue Mask = 0x%.8x\n", SDL_Log(" Blue Mask = 0x%.8x\n",
Bmask); Bmask);
if (Amask) if (Amask)
fprintf(stderr, SDL_Log(" Alpha Mask = 0x%.8x\n",
" Alpha Mask = 0x%.8x\n",
Amask); Amask);
} }
} }
@ -770,11 +767,11 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
#if SDL_VIDEO_DRIVER_WINDOWS #if SDL_VIDEO_DRIVER_WINDOWS
/* Print the D3D9 adapter index */ /* Print the D3D9 adapter index */
adapterIndex = SDL_Direct3D9GetAdapterIndex( i ); adapterIndex = SDL_Direct3D9GetAdapterIndex( i );
fprintf( stderr, "D3D9 Adapter Index: %d", adapterIndex ); SDL_Log("D3D9 Adapter Index: %d", adapterIndex);
/* Print the DXGI adapter and output indices */ /* Print the DXGI adapter and output indices */
SDL_DXGIGetOutputInfo(i, &adapterIndex, &outputIndex); SDL_DXGIGetOutputInfo(i, &adapterIndex, &outputIndex);
fprintf( stderr, "DXGI Adapter Index: %d Output Index: %d", adapterIndex, outputIndex ); SDL_Log("DXGI Adapter Index: %d Output Index: %d", adapterIndex, outputIndex);
#endif #endif
} }
} }
@ -784,9 +781,9 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
n = SDL_GetNumRenderDrivers(); n = SDL_GetNumRenderDrivers();
if (n == 0) { if (n == 0) {
fprintf(stderr, "No built-in render drivers\n"); SDL_Log("No built-in render drivers\n");
} else { } else {
fprintf(stderr, "Built-in render drivers:\n"); SDL_Log("Built-in render drivers:\n");
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
SDL_GetRenderDriverInfo(i, &info); SDL_GetRenderDriverInfo(i, &info);
SDLTest_PrintRenderer(&info); SDLTest_PrintRenderer(&info);
@ -824,7 +821,7 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
(SDL_Texture **) SDL_malloc(state->num_windows * (SDL_Texture **) SDL_malloc(state->num_windows *
sizeof(*state->targets)); sizeof(*state->targets));
if (!state->windows || !state->renderers) { if (!state->windows || !state->renderers) {
fprintf(stderr, "Out of memory!\n"); SDL_Log("Out of memory!\n");
return SDL_FALSE; return SDL_FALSE;
} }
for (i = 0; i < state->num_windows; ++i) { for (i = 0; i < state->num_windows; ++i) {
@ -841,7 +838,7 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
state->window_w, state->window_h, state->window_w, state->window_h,
state->window_flags); state->window_flags);
if (!state->windows[i]) { if (!state->windows[i]) {
fprintf(stderr, "Couldn't create window: %s\n", SDL_Log("Couldn't create window: %s\n",
SDL_GetError()); SDL_GetError());
return SDL_FALSE; return SDL_FALSE;
} }
@ -859,7 +856,7 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
state->window_h = h; state->window_h = h;
} }
if (SDL_SetWindowDisplayMode(state->windows[i], &fullscreen_mode) < 0) { if (SDL_SetWindowDisplayMode(state->windows[i], &fullscreen_mode) < 0) {
fprintf(stderr, "Can't set up fullscreen display mode: %s\n", SDL_Log("Can't set up fullscreen display mode: %s\n",
SDL_GetError()); SDL_GetError());
return SDL_FALSE; return SDL_FALSE;
} }
@ -893,8 +890,7 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
} }
} }
if (m == -1) { if (m == -1) {
fprintf(stderr, SDL_Log("Couldn't find render driver named %s",
"Couldn't find render driver named %s",
state->renderdriver); state->renderdriver);
return SDL_FALSE; return SDL_FALSE;
} }
@ -902,7 +898,7 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
state->renderers[i] = SDL_CreateRenderer(state->windows[i], state->renderers[i] = SDL_CreateRenderer(state->windows[i],
m, state->render_flags); m, state->render_flags);
if (!state->renderers[i]) { if (!state->renderers[i]) {
fprintf(stderr, "Couldn't create renderer: %s\n", SDL_Log("Couldn't create renderer: %s\n",
SDL_GetError()); SDL_GetError());
return SDL_FALSE; return SDL_FALSE;
} }
@ -914,7 +910,7 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
if (state->verbose & VERBOSE_RENDER) { if (state->verbose & VERBOSE_RENDER) {
SDL_RendererInfo info; SDL_RendererInfo info;
fprintf(stderr, "Current renderer:\n"); SDL_Log("Current renderer:\n");
SDL_GetRendererInfo(state->renderers[i], &info); SDL_GetRendererInfo(state->renderers[i], &info);
SDLTest_PrintRenderer(&info); SDLTest_PrintRenderer(&info);
} }
@ -926,30 +922,30 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
if (state->verbose & VERBOSE_AUDIO) { if (state->verbose & VERBOSE_AUDIO) {
n = SDL_GetNumAudioDrivers(); n = SDL_GetNumAudioDrivers();
if (n == 0) { if (n == 0) {
fprintf(stderr, "No built-in audio drivers\n"); SDL_Log("No built-in audio drivers\n");
} else { } else {
fprintf(stderr, "Built-in audio drivers:"); SDL_Log("Built-in audio drivers:");
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
if (i > 0) { if (i > 0) {
fprintf(stderr, ","); SDL_Log(",");
} }
fprintf(stderr, " %s", SDL_GetAudioDriver(i)); SDL_Log(" %s", SDL_GetAudioDriver(i));
} }
fprintf(stderr, "\n"); SDL_Log("\n");
} }
} }
if (SDL_AudioInit(state->audiodriver) < 0) { if (SDL_AudioInit(state->audiodriver) < 0) {
fprintf(stderr, "Couldn't initialize audio driver: %s\n", SDL_Log("Couldn't initialize audio driver: %s\n",
SDL_GetError()); SDL_GetError());
return SDL_FALSE; return SDL_FALSE;
} }
if (state->verbose & VERBOSE_VIDEO) { if (state->verbose & VERBOSE_VIDEO) {
fprintf(stderr, "Audio driver: %s\n", SDL_Log("Audio driver: %s\n",
SDL_GetCurrentAudioDriver()); SDL_GetCurrentAudioDriver());
} }
if (SDL_OpenAudio(&state->audiospec, NULL) < 0) { if (SDL_OpenAudio(&state->audiospec, NULL) < 0) {
fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError()); SDL_Log("Couldn't open audio: %s\n", SDL_GetError());
return SDL_FALSE; return SDL_FALSE;
} }
} }
@ -1257,19 +1253,19 @@ SDLTest_ScreenShot(SDL_Renderer *renderer)
#endif #endif
0x00000000); 0x00000000);
if (!surface) { if (!surface) {
fprintf(stderr, "Couldn't create surface: %s\n", SDL_GetError()); SDL_Log("Couldn't create surface: %s\n", SDL_GetError());
return; return;
} }
if (SDL_RenderReadPixels(renderer, NULL, surface->format->format, if (SDL_RenderReadPixels(renderer, NULL, surface->format->format,
surface->pixels, surface->pitch) < 0) { surface->pixels, surface->pitch) < 0) {
fprintf(stderr, "Couldn't read screen: %s\n", SDL_GetError()); SDL_Log("Couldn't read screen: %s\n", SDL_GetError());
SDL_free(surface); SDL_free(surface);
return; return;
} }
if (SDL_SaveBMP(surface, "screenshot.bmp") < 0) { if (SDL_SaveBMP(surface, "screenshot.bmp") < 0) {
fprintf(stderr, "Couldn't save screenshot.bmp: %s\n", SDL_GetError()); SDL_Log("Couldn't save screenshot.bmp: %s\n", SDL_GetError());
SDL_free(surface); SDL_free(surface);
return; return;
} }