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

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 472a1b2c..a3dcbab9 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -28,10 +28,10 @@
 #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"
 
 int in_type1, in_type2;
@@ -240,9 +240,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) {
@@ -270,7 +273,7 @@ static void pl_vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 	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;
@@ -606,6 +609,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