X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=43216c6752bcb532aa3f5aef8f09d8b2ce3537a4;hb=96867f0e3c8f3a78ac3b9e34ba8bee757ecbc1d0;hp=50aba227cf7afda52d83f62e37b2e2a888a2ed28;hpb=2da2fc7676c1fc40d26226a7a4c43728d9a2eedf;p=pcsx_rearmed.git

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 50aba227..43216c67 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -227,12 +227,12 @@ static void update_layer_size(int w, int h)
 		break;
 	}
 
-	g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2;
-	g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2;
-	if (g_layer_x < 0) g_layer_x = 0;
-	if (g_layer_y < 0) g_layer_y = 0;
-	if (g_layer_w > g_menuscreen_w) g_layer_w = g_menuscreen_w;
-	if (g_layer_h > g_menuscreen_h) g_layer_h = g_menuscreen_h;
+	if (g_scaler != SCALE_CUSTOM) {
+		g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2;
+		g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2;
+	}
+	if (g_layer_w > g_menuscreen_w * 2) g_layer_w = g_menuscreen_w * 2;
+	if (g_layer_h > g_menuscreen_h * 2) g_layer_h = g_menuscreen_h * 2;
 }
 
 // XXX: this is platform specific really
@@ -391,17 +391,21 @@ static void pl_vout_flip(const void *vram, int stride, int bgr24,
 	}
 	else if (scanlines != 0 && scanline_level != 100)
 	{
-		int l = scanline_level * 2048 / 100;
+		int h2, l = scanline_level * 2048 / 100;
 		int stride_0 = pl_vout_scale_h >= 2 ? 0 : stride;
 
 		h1 *= pl_vout_scale_h;
-		for (; h1 >= 2; h1 -= 2)
+		while (h1 > 0)
 		{
-			bgr555_to_rgb565(dest, src, w * 2);
-			dest += dstride * 2, src += stride_0;
+			for (h2 = scanlines; h2 > 0 && h1 > 0; h2--, h1--) {
+				bgr555_to_rgb565(dest, src, w * 2);
+				dest += dstride * 2, src += stride_0;
+			}
 
-			bgr555_to_rgb565_b(dest, src, w * 2, l);
-			dest += dstride * 2, src += stride;
+			for (h2 = scanlines; h2 > 0 && h1 > 0; h2--, h1--) {
+				bgr555_to_rgb565_b(dest, src, w * 2, l);
+				dest += dstride * 2, src += stride;
+			}
 		}
 	}
 #endif