X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplat_omap.c;h=1a725ff500b6b296e3275d08a80dfc2d6e8aea8a;hp=4ab7cf042899118bff84535c5e6949a35c4281fa;hb=7badc9353b9570fd1c67827cfb477cef07974ddb;hpb=3a321131b0f1d75685b7487517fc84738f4186d2

diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c
index 4ab7cf04..1a725ff5 100644
--- a/frontend/plat_omap.c
+++ b/frontend/plat_omap.c
@@ -1,5 +1,5 @@
 /*
- * (C) notaz, 2010
+ * (C) Gražvydas "notaz" Ignotas, 2010-2012
  *
  * This work is licensed under the terms of the GNU GPLv2 or later.
  * See the COPYING file in the top-level directory.
@@ -19,15 +19,10 @@
 #include "linux/xenv.h"
 #include "plugin_lib.h"
 #include "pl_gun_ts.h"
-#include "omap.h"
 #include "plat.h"
+#include "menu.h"
 
-
-static struct vout_fbdev *main_fb;
-int g_layer_x = 80, g_layer_y = 0;
-int g_layer_w = 640, g_layer_h = 480;
-
-struct vout_fbdev *layer_fb;
+static struct vout_fbdev *main_fb, *layer_fb;
 
 static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
 {
@@ -79,7 +74,7 @@ static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
 	return 0;
 }
 
-int omap_enable_layer(int enabled)
+static int omap_enable_layer(int enabled)
 {
 	if (enabled)
 		pl_set_gun_rect(g_layer_x, g_layer_y, g_layer_w, g_layer_h);
@@ -88,6 +83,36 @@ int omap_enable_layer(int enabled)
 		g_layer_x, g_layer_y, g_layer_w, g_layer_h);
 }
 
+void plat_gvideo_open(void)
+{
+	omap_enable_layer(1);
+
+	// try to align redraws to vsync
+	vout_fbdev_wait_vsync(layer_fb);
+}
+
+void *plat_gvideo_set_mode(int *w, int *h, int *bpp)
+{
+	void *buf;
+
+	vout_fbdev_clear(layer_fb);
+	buf = vout_fbdev_resize(layer_fb, *w, *h, *bpp, 0, 0, 0, 0, 3);
+
+	omap_enable_layer(1);
+
+	return buf;
+}
+
+void *plat_gvideo_flip(void)
+{
+	return vout_fbdev_flip(layer_fb);
+}
+
+void plat_gvideo_close(void)
+{
+	omap_enable_layer(0);
+}
+
 void plat_video_menu_enter(int is_rom_loaded)
 {
 	g_menuscreen_ptr = vout_fbdev_resize(main_fb,
@@ -133,10 +158,14 @@ void plat_trigger_vibrate(int is_strong)
 {
 }
 
+void *plat_prepare_screenshot(int *w, int *h, int *bpp)
+{
+	return NULL;
+}
+
 void plat_init(void)
 {
 	const char *main_fb_name, *layer_fb_name;
-	void *temp_frame;
 	int fd, ret, w, h;
 
 	main_fb_name = getenv("FBDEV_MAIN");
@@ -155,6 +184,9 @@ void plat_init(void)
 		exit(1);
 	}
 
+	g_layer_x = 80, g_layer_y = 0;
+	g_layer_w = 640, g_layer_h = 480;
+
 	ret = omap_setup_layer_(fd, 0, g_layer_x, g_layer_y, g_layer_w, g_layer_h);
 	close(fd);
 	if (ret != 0) {
@@ -185,13 +217,6 @@ void plat_init(void)
 		goto fail0;
 	}
 
-	temp_frame = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1);
-	if (temp_frame == NULL) {
-		fprintf(stderr, "OOM\n");
-		goto fail1;
-	}
-	g_menubg_ptr = temp_frame;
-
 	plat_pandora_init(); // XXX
 
 	return;