X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplat_omap.c;h=f25f31cc21f7a9ddd735f390294b3db71b404f18;hp=e5b6c04ed48b066f51112673aa50d7cb5ed245a6;hb=92a5fe88a86f0a25c3bbc74f80b67b16e18608e7;hpb=2857d72e4ca743bba3cf55e298949e24d97dff02

diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c
index e5b6c04e..f25f31cc 100644
--- a/frontend/plat_omap.c
+++ b/frontend/plat_omap.c
@@ -14,10 +14,10 @@
 #include <unistd.h>
 #include <linux/omapfb.h>
 
-#include "common/menu.h"
-#include "common/input.h"
-#include "linux/fbdev.h"
-#include "linux/xenv.h"
+#include "libpicofe/menu.h"
+#include "libpicofe/input.h"
+#include "libpicofe/linux/fbdev.h"
+#include "libpicofe/linux/xenv.h"
 #include "plugin_lib.h"
 #include "pl_gun_ts.h"
 #include "plat.h"
@@ -94,22 +94,28 @@ void plat_omap_gvideo_open(void)
 	vout_fbdev_wait_vsync(layer_fb);
 }
 
-void *plat_gvideo_set_mode(int *w, int *h, int *bpp)
+void *plat_gvideo_set_mode(int *w_in, int *h_in, int *bpp)
 {
 	int l = 0, r = 0, t = 0, b = 0;
+	int w = *w_in, h = *h_in;
 	void *buf;
 
-	if (g_scaler == SCALE_1_1) {
-		if (*w > g_menuscreen_w)
-			l = r = (*w - g_menuscreen_w) / 2;
-		if (*h > g_menuscreen_h)
-			t = b = (*h - g_menuscreen_h) / 2;
+	if (g_scaler == SCALE_1_1 || g_scaler == SCALE_2_2) {
+		if (w > g_menuscreen_w) {
+			l = r = (w - g_menuscreen_w) / 2;
+			w -= l + r;
+		}
+		if (h > g_menuscreen_h) {
+			t = b = (h - g_menuscreen_h) / 2;
+			h -= t + b;
+		}
 	}
 
-	vout_fbdev_clear(layer_fb);
-	buf = vout_fbdev_resize(layer_fb, *w, *h, *bpp,
+	buf = vout_fbdev_resize(layer_fb, w, h, *bpp,
 		l, r, t, b, 3);
 
+	vout_fbdev_clear(layer_fb);
+
 	omap_enable_layer(1);
 
 	return buf;