X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fsdlif.c;h=190e69a92a26aaaac8bd240c221b7c71ff718bbc;hb=0c7caf2be89c7285aed60c5cb7a5ace9776033ab;hp=1d682fb7af8033125088857aa3c363d9d773bf09;hpb=9225e894f5e5f4595741065701978ef6730213a2;p=sdl_omap.git diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c index 1d682fb..190e69a 100644 --- a/src/video/omapdss/sdlif.c +++ b/src/video/omapdss/sdlif.c @@ -1,5 +1,5 @@ /* - * (C) Gražvydas "notaz" Ignotas, 2010 + * (C) Gražvydas "notaz" Ignotas, 2010-2012 * * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. * See the COPYING file in the top-level directory. @@ -94,6 +94,7 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren struct SDL_PrivateVideoData *pdata = this->hidden; SDL_PixelFormat *format; Uint32 unhandled_flags; + int doublebuf; void *fbmem; trace("%d, %d, %d, %08x", width, height, bpp, flags); @@ -108,7 +109,7 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren format = SDL_ReallocFormat(current, 24, 0xff0000, 0xff00, 0xff, 0); break; case 32: - format = SDL_ReallocFormat(current, 32, 0xff0000, 0xff00, 0xff, 0xff000000); + format = SDL_ReallocFormat(current, 32, 0xff0000, 0xff00, 0xff, 0); break; default: err("SetVideoMode: bpp %d not supported", bpp); @@ -131,14 +132,20 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren } } + doublebuf = (flags & SDL_DOUBLEBUF) ? 1 : 0; fbmem = osdl_video_set_mode(pdata, pdata->border_l, pdata->border_r, pdata->border_t, pdata->border_b, - width, height, bpp, (flags & SDL_DOUBLEBUF) ? 1 : 0); + width, height, bpp, &doublebuf); if (fbmem == NULL) { - log("failing on mode %dx%d@%d, doublebuf %s", - width, height, bpp, (flags & SDL_DOUBLEBUF) ? "on" : "off"); + err("failing on mode %dx%d@%d, doublebuf %s, border %d,%d,%d,%d", + width, height, bpp, (flags & SDL_DOUBLEBUF) ? "on" : "off", + pdata->border_l, pdata->border_r, pdata->border_t, pdata->border_b); return NULL; } + if ((flags & SDL_DOUBLEBUF) && !doublebuf) { + log("doublebuffering could not be set\n"); + flags &= ~SDL_DOUBLEBUF; + } flags |= SDL_FULLSCREEN | SDL_HWSURFACE; unhandled_flags = flags & ~(SDL_FULLSCREEN | SDL_HWSURFACE | SDL_DOUBLEBUF);