|| plat_target.vout_method == vout_mode_overlay2x) {
int W = plat_target.vout_method == vout_mode_overlay2x && w == 320 ? 2*w : w;
plat_sdl_overlay = SDL_CreateYUVOverlay(W, h, SDL_UYVY_OVERLAY, plat_sdl_screen);
- if (plat_sdl_overlay != NULL) {
+ if (plat_sdl_overlay != NULL && SDL_LockYUVOverlay(plat_sdl_overlay) == 0) {
if ((long)plat_sdl_overlay->pixels[0] & 3)
fprintf(stderr, "warning: overlay pointer is unaligned\n");
plat_sdl_overlay_clear();
+
+ SDL_UnlockYUVOverlay(plat_sdl_overlay);
}
else {
fprintf(stderr, "warning: could not create overlay.\n");
if (plat_target.vout_method == 0) {
SDL_PumpEvents();
-#if defined(SDL_TRIPLEBUF) && defined(SDL_BUFFER_3X)
+#if defined SDL_SURFACE_SW
+ plat_sdl_screen = SDL_SetVideoMode(w, h, 16, SDL_SWSURFACE);
+#elif defined(SDL_TRIPLEBUF) && defined(SDL_BUFFER_3X)
plat_sdl_screen = SDL_SetVideoMode(w, h, 16, SDL_HWSURFACE | SDL_TRIPLEBUF);
#else
plat_sdl_screen = SDL_SetVideoMode(w, h, 16, SDL_HWSURFACE | SDL_DOUBLEBUF);
static const char *vout_list[] = { NULL, NULL, NULL, NULL, NULL };
const SDL_VideoInfo *info;
SDL_SysWMinfo wminfo;
+ const char *env;
int overlay_works = 0;
int gl_works = 0;
int i, ret, h;
+ int try_gl;
ret = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
if (ret != 0) {
}
g_menuscreen_w = window_w = plat_sdl_screen->w;
g_menuscreen_h = window_h = plat_sdl_screen->h;
+ g_menuscreen_pp = g_menuscreen_w;
// overlay/gl require native bpp in some cases..
plat_sdl_screen = SDL_SetVideoMode(g_menuscreen_w, g_menuscreen_h,
(void)wminfo;
#endif
- ret = gl_init(display, window, &gl_quirks);
+ ret = -1;
+ try_gl = 1;
+ env = getenv("DISPLAY");
+ if (env && env[0] != ':') {
+ fprintf(stderr, "looks like a remote DISPLAY, "
+ "not trying GL (use PICOFE_GL=1 to override)\n");
+ // because some drivers just kill the program with no way to recover
+ try_gl = 0;
+ }
+ env = getenv("PICOFE_GL");
+ if (env)
+ try_gl = atoi(env);
+ if (try_gl)
+ ret = gl_init(display, window, &gl_quirks);
if (ret == 0) {
+ gl_announce();
gl_works = 1;
gl_finish();
}
}
plat_target.vout_methods = vout_list;
+ plat_sdl_change_video_mode(g_menuscreen_w, g_menuscreen_h, 1);
return 0;
fail: