X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=c6a2bf0e143ea2ef7b6fe51cbfeb1b3c5cbd7be5;hp=472a1b2c1e0737a2e2ec4a2547d300016646b1ec;hb=2391c1b4a91068853fb2d783c8f7613658be4250;hpb=0fed3dc3d9799a9db68dd8be4172aafb0e161957

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 472a1b2c..c6a2bf0e 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -28,12 +28,14 @@
 #include "plat.h"
 #include "pcnt.h"
 #include "pl_gun_ts.h"
+#include "cspace.h"
 #include "psemu_plugin_defs.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../libpcsxcore/psxmem_map.h"
-#include "../plugins/gpulib/cspace.h"
 #include "../plugins/dfinput/externals.h"
 
+#define HUD_HEIGHT 10
+
 int in_type1, in_type2;
 int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
 int in_adev[2] = { -1, -1 }, in_adev_axis[2][2] = {{ 0, 1 }, { 0, 1 }};
@@ -44,7 +46,7 @@ void *tsdev;
 void *pl_vout_buf;
 int g_layer_x, g_layer_y, g_layer_w, g_layer_h;
 static int pl_vout_w, pl_vout_h, pl_vout_bpp; /* output display/layer */
-static int pl_vout_scale, pl_vout_yoffset;
+static int pl_vout_scale_w, pl_vout_scale_h, pl_vout_yoffset;
 static int psx_w, psx_h, psx_bpp;
 static int vsync_cnt;
 static int is_pal, frame_interval, frame_interval1024;
@@ -101,20 +103,20 @@ static void hud_printf(void *fb, int w, int x, int y, const char *texto, ...)
 
 static void print_msg(int h, int border)
 {
-	hud_print(pl_vout_buf, pl_vout_w, border + 2, h - 10, hud_msg);
+	hud_print(pl_vout_buf, pl_vout_w, border + 2, h - HUD_HEIGHT, hud_msg);
 }
 
 static void print_fps(int h, int border)
 {
-	hud_printf(pl_vout_buf, pl_vout_w, border + 2, h - 10,
+	hud_printf(pl_vout_buf, pl_vout_w, border + 2, h - HUD_HEIGHT,
 		"%2d %4.1f", pl_rearmed_cbs.flips_per_sec,
 		pl_rearmed_cbs.vsps_cur);
 }
 
 static void print_cpu_usage(int w, int h, int border)
 {
-	hud_printf(pl_vout_buf, pl_vout_w, pl_vout_w - border - 28, h - 10,
-		"%3d", pl_rearmed_cbs.cpu_usage);
+	hud_printf(pl_vout_buf, pl_vout_w, pl_vout_w - border - 28,
+		h - HUD_HEIGHT, "%3d", pl_rearmed_cbs.cpu_usage);
 }
 
 // draw 192x8 status of 24 sound channels
@@ -126,7 +128,7 @@ static __attribute__((noinline)) void draw_active_chans(int vout_w, int vout_h)
 
 	static const unsigned short colors[2] = { 0x1fe3, 0x0700 };
 	unsigned short *dest = (unsigned short *)pl_vout_buf +
-		vout_w * (vout_h - 10) + vout_w / 2 - 192/2;
+		vout_w * (vout_h - HUD_HEIGHT) + vout_w / 2 - 192/2;
 	unsigned short *d, p;
 	int c, x, y;
 
@@ -180,6 +182,14 @@ static void update_layer_size(int w, int h)
 		g_layer_w = w; g_layer_h = h;
 		break;
 
+	case SCALE_2_2:
+		g_layer_w = w; g_layer_h = h;
+		if (w * 2 <= g_menuscreen_w)
+			g_layer_w = w * 2;
+		if (h * 2 <= g_menuscreen_h)
+			g_layer_h = h * 2;
+		break;
+
 	case SCALE_4_3v2:
 		if (h > g_menuscreen_h || (240 < h && h <= 360))
 			goto fractional_4_3;
@@ -222,7 +232,7 @@ static void update_layer_size(int w, int h)
 }
 
 // XXX: this is platform specific really
-static int resolution_ok(int w, int h)
+static inline int resolution_ok(int w, int h)
 {
 	return w <= 1024 && h <= 512;
 }
@@ -240,9 +250,12 @@ static void pl_vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 
 	psx_w = raw_w;
 	psx_h = raw_h;
+	psx_bpp = bpp;
 	vout_w = w;
 	vout_h = h;
-	vout_bpp = psx_bpp = bpp;
+	vout_bpp = bpp;
+	if (pl_rearmed_cbs.only_16bpp)
+		vout_bpp = 16;
 
 	// don't use very low heights
 	if (vout_h < 192) {
@@ -250,27 +263,32 @@ static void pl_vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 		vout_h = 192;
 	}
 
-	pl_vout_scale = 1;
+	pl_vout_scale_w = pl_vout_scale_h = 1;
 #ifdef __ARM_NEON__
 	if (soft_filter) {
 		if (resolution_ok(w * 2, h * 2) && bpp == 16) {
-			vout_w *= 2;
-			vout_h *= 2;
-			pl_vout_scale = 2;
+			pl_vout_scale_w = 2;
+			pl_vout_scale_h = 2;
 		}
 		else {
 			// filter unavailable
 			hud_msg[0] = 0;
 		}
 	}
+	else if (scanlines != 0 && scanline_level != 100 && bpp == 16) {
+		if (h <= 256)
+			pl_vout_scale_h = 2;
+	}
 #endif
+	vout_w *= pl_vout_scale_w;
+	vout_h *= pl_vout_scale_h;
 
 	update_layer_size(vout_w, vout_h);
 
 	pl_vout_buf = plat_gvideo_set_mode(&vout_w, &vout_h, &vout_bpp);
 	if (pl_vout_buf == NULL && pl_plat_blit == NULL)
 		fprintf(stderr, "failed to set mode %dx%d@%d\n",
-			vout_w, vout_h, psx_bpp);
+			vout_w, vout_h, vout_bpp);
 	else {
 		pl_vout_w = vout_w;
 		pl_vout_h = vout_h;
@@ -305,7 +323,7 @@ static void pl_vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 	}
 
 	// borders
-	doffs = (dstride - w * pl_vout_scale) / 2 & ~1;
+	doffs = (dstride - w * pl_vout_scale_w) / 2 & ~1;
 
 	if (doffs > doffs_old)
 		clear_counter = 2;
@@ -350,19 +368,36 @@ static void pl_vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 		}
 	}
 #ifdef __ARM_NEON__
-	else if (soft_filter == SOFT_FILTER_SCALE2X && pl_vout_scale == 2)
+	else if (soft_filter == SOFT_FILTER_SCALE2X && pl_vout_scale_w == 2)
 	{
 		neon_scale2x_16_16(src, (void *)dest, w,
 			stride * 2, dstride * 2, h);
 	}
-	else if (soft_filter == SOFT_FILTER_EAGLE2X && pl_vout_scale == 2)
+	else if (soft_filter == SOFT_FILTER_EAGLE2X && pl_vout_scale_w == 2)
 	{
 		neon_eagle2x_16_16(src, (void *)dest, w,
 			stride * 2, dstride * 2, h);
 	}
+	else if (scanlines != 0 && scanline_level != 100)
+	{
+		int 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)
+		{
+			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;
+		}
+	}
 #endif
 	else
 	{
+		src = (void *)((uintptr_t)src & ~3); // align for the blitter
+
 		for (; h1-- > 0; dest += dstride * 2, src += stride)
 		{
 			bgr555_to_rgb565(dest, src, w * 2);
@@ -370,7 +405,7 @@ static void pl_vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 	}
 
 out_hud:
-	print_hud(w * pl_vout_scale, h * pl_vout_scale, 0);
+	print_hud(w * pl_vout_scale_w, h * pl_vout_scale_h, 0);
 
 out:
 	pcnt_end(PCNT_BLIT);
@@ -433,7 +468,8 @@ static int dispmode_default(void)
 	return 1;
 }
 
-int dispmode_doubleres(void)
+#ifdef __ARM_NEON__
+static int dispmode_doubleres(void)
 {
 	if (!(pl_rearmed_cbs.gpu_caps & GPU_CAP_SUPPORTS_2X)
 	    || !resolution_ok(psx_w * 2, psx_h * 2) || psx_bpp != 16)
@@ -445,7 +481,7 @@ int dispmode_doubleres(void)
 	return 1;
 }
 
-int dispmode_scale2x(void)
+static int dispmode_scale2x(void)
 {
 	if (!resolution_ok(psx_w * 2, psx_h * 2) || psx_bpp != 16)
 		return 0;
@@ -456,7 +492,7 @@ int dispmode_scale2x(void)
 	return 1;
 }
 
-int dispmode_eagle2x(void)
+static int dispmode_eagle2x(void)
 {
 	if (!resolution_ok(psx_w * 2, psx_h * 2) || psx_bpp != 16)
 		return 0;
@@ -466,6 +502,7 @@ int dispmode_eagle2x(void)
 	snprintf(hud_msg, sizeof(hud_msg), "eagle2x");
 	return 1;
 }
+#endif
 
 static int (*dispmode_switchers[])(void) = {
 	dispmode_default,
@@ -579,9 +616,7 @@ static void update_input(void)
 	in_keystate = actions[IN_BINDTYPE_PLAYER12];
 }
 #else /* MAEMO */
-static void update_input(void)
-{
-}
+extern void update_input(void);
 #endif
 
 void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in)
@@ -606,6 +641,9 @@ void pl_frame_limit(void)
 	struct timeval now;
 	int diff, usadj;
 
+	if (g_emu_resetting)
+		return;
+
 	vsync_cnt++;
 
 	/* doing input here because the pad is polled