X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=0d0a5f6a5e106337ee0e7df99499412909190b38;hp=a7aa8b2a81272808e1dab130d2f32509a75577b3;hb=25c1e50390c480128a327519c37a0bf5df3a996f;hpb=4f5a1b2a86d077d32086de91f487a2ee5270714d

diff --git a/frontend/menu.c b/frontend/menu.c
index a7aa8b2a..0d0a5f6a 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -21,10 +21,12 @@
 #include "plugin_lib.h"
 #include "omap.h"
 #include "pcnt.h"
+#include "arm_utils.h"
 #include "common/plat.h"
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/cdrom.h"
 #include "../libpcsxcore/psemu_plugin_defs.h"
+#include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfinput/pad.h"
 #include "revision.h"
 
@@ -442,7 +444,6 @@ static void draw_savestate_bg(int slot);
 // a bit of black magic here
 static void draw_savestate_bg(int slot)
 {
-	extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
 	static const int psx_widths[8]  = { 256, 368, 320, 384, 512, 512, 640, 640 };
 	int x, y, w, h;
 	char fname[MAXPATHLEN];
@@ -666,6 +667,7 @@ me_bind_action emuctrl_actions[] =
 	{ "Prev Save Slot   ", 1 << SACTION_PREV_SSLOT },
 	{ "Next Save Slot   ", 1 << SACTION_NEXT_SSLOT },
 	{ "Toggle Frameskip ", 1 << SACTION_TOGGLE_FSKIP },
+	{ "Take Screenshot  ", 1 << SACTION_SCREENSHOT },
 	{ "Enter Menu       ", 1 << SACTION_ENTER_MENU },
 	{ NULL,                0 }
 };
@@ -1176,26 +1178,51 @@ static int menu_loop_options(int id, int keys)
 
 // ------------ debug menu ------------
 
-static void draw_frame_debug(void)
+static void draw_frame_debug(GPUFreeze_t *gpuf)
 {
+	int w = min(g_menuscreen_w, 1024);
+	int h = min(g_menuscreen_h, 512);
+	u16 *d = g_menuscreen_ptr;
+	u16 *s = (u16 *)gpuf->psxVRam;
+	char buff[64];
+	int ty = 1;
+
+	gpuf->ulFreezeVersion = 1;
+	if (GPU_freeze != NULL)
+		GPU_freeze(1, gpuf);
+
+	for (; h > 0; h--, d += g_menuscreen_w, s += 1024)
+		bgr555_to_rgb565(d, s, w * 2);
+
 	smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " REV, 0xe7fc);
+	snprintf(buff, sizeof(buff), "GPU sr: %08x", gpuf->ulStatus);
+	smalltext_out16(4, (ty += me_sfont_h), buff, 0xe7fc);
+	snprintf(buff, sizeof(buff), "PC/SP: %08x %08x", psxRegs.pc, psxRegs.GPR.n.sp);
+	smalltext_out16(4, (ty += me_sfont_h), buff, 0xe7fc);
 }
 
 static void debug_menu_loop(void)
 {
+	GPUFreeze_t *gpuf;
 	int inp;
 
+	gpuf = malloc(sizeof(*gpuf));
+	if (gpuf == NULL)
+		return;
+
 	while (1)
 	{
-		menu_draw_begin(1);
-		draw_frame_debug();
+		menu_draw_begin(0);
+		draw_frame_debug(gpuf);
 		menu_draw_end();
 
 		inp = in_menu_wait(PBTN_MOK|PBTN_MBACK|PBTN_MA2|PBTN_MA3|PBTN_L|PBTN_R |
 					PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT, 70);
 		if (inp & PBTN_MBACK)
-			return;
+			break;
 	}
+
+	free(gpuf);
 }
 
 // ------------ main menu ------------
@@ -1216,9 +1243,7 @@ static void menu_bios_warn(void)
 
 	while (1)
 	{
-		menu_draw_begin(1);
 		draw_menu_message(msg, NULL);
-		menu_draw_end();
 
 		inp = in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
 		if (inp & (PBTN_MBACK|PBTN_MOK))
@@ -1349,6 +1374,8 @@ static int romsel_run(void)
 
 	printf("selected file: %s\n", fname);
 
+	new_dynarec_clear_full();
+
 	if (run_cd_image(fname) != 0)
 		return -1;