/*
- * (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.
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);
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);
}
}
+ 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);
current->h = height;
current->pitch = SDL_CalculatePitch(current);
current->pixels = fbmem;
+ pdata->app_uses_flip = 0;
if (pdata->layer_w != 0 && pdata->layer_h != 0) {
int v_width = width - (pdata->border_l + pdata->border_r);
static int omap_FlipHWSurface(SDL_VideoDevice *this, SDL_Surface *surface)
{
+ struct SDL_PrivateVideoData *pdata = this->hidden;
+
trace("%p", surface);
- surface->pixels = osdl_video_flip(this->hidden);
+ surface->pixels = osdl_video_flip(pdata);
+ pdata->app_uses_flip = 1;
return 0;
}
static void omap_UpdateRects(SDL_VideoDevice *this, int nrects, SDL_Rect *rects)
{
+ struct SDL_PrivateVideoData *pdata = this->hidden;
+
trace("%d, %p", nrects, rects);
- /* hmh.. */
- if (nrects == 1 && rects->x == 0 && rects->y == 0 &&
- (this->screen->flags & SDL_DOUBLEBUF) &&
- rects->w == this->screen->w && rects->h == this->screen->h)
+ /* for doublebuf forcing on apps */
+ if (nrects == 1 && rects->x == 0 && rects->y == 0
+ && !pdata->app_uses_flip && (this->screen->flags & SDL_DOUBLEBUF)
+ && rects->w == this->screen->w && rects->h == this->screen->h)
{
- this->screen->pixels = osdl_video_flip(this->hidden);
+ this->screen->pixels = osdl_video_flip(pdata);
}
}