X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fsdlif.c;h=f7a6d28ea4bb7d761a43af5f0ff665df116e41a8;hb=9ab462cd62f28e75898b20c6d9e31ad45a220d7d;hp=fb690d47a4cf37c528b0af6877247f29214ede1e;hpb=455c8c43b353b60ebbb70caa09ae87be49520838;p=sdl_omap.git

diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c
index fb690d4..f7a6d28 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.
@@ -13,7 +13,7 @@
 #include "../../events/SDL_events_c.h"
 
 #include "linux/xenv.h"
-#include "omapsdl.h"
+#include "osdl.h"
 
 
 static int omap_available(void) 
@@ -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);
@@ -152,6 +159,7 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren
 	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);
@@ -177,9 +185,12 @@ static void omap_UnlockHWSurface(SDL_VideoDevice *this, SDL_Surface *surface)
 
 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;
 }
@@ -204,14 +215,16 @@ static int omap_SetColors(SDL_VideoDevice *this, int firstcolor, int ncolors, SD
 
 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);
 	}
 }