X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=gp2x%2Fmenu.c;h=a9b08257c596e43422c787e4a9fb54d940676789;hb=6e507f764b95d5f6088ea7f174586cfb0360a236;hp=c428a6081a8efb144d9d162d1e61c23e0b5ac956;hpb=a479005630268d6f2adfcc0f9562593f643c4c2c;p=libpicofe.git

diff --git a/gp2x/menu.c b/gp2x/menu.c
index c428a60..a9b0825 100644
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -432,8 +432,10 @@ rescan:
 // ------------ debug menu ------------
 
 char *debugString(void);
+void PicoDrawShowSpriteStats(unsigned short *screen, int stride);
+void PicoDrawShowPalette(unsigned short *screen, int stride);
 
-static void draw_debug(void)
+static void draw_main_debug(void)
 {
 	char *p, *str = debugString();
 	int len, line;
@@ -450,13 +452,49 @@ static void draw_debug(void)
 		if (*p == 0) break;
 		p++; str = p;
 	}
-	menu_flip();
+}
+
+static void draw_frame_debug(void)
+{
+	char layer_str[48] = "layers:             ";
+	if (PicoDrawMask & PDRAW_LAYERB_ON)      memcpy(layer_str +  8, "B", 1);
+	if (PicoDrawMask & PDRAW_LAYERA_ON)      memcpy(layer_str + 10, "A", 1);
+	if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);
+	if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);
+
+	memset(gp2x_screen, 0, 320*240*2);
+	emu_forcedFrame(0);
+	smalltext_out16(4, 232, layer_str, 0xffff);
 }
 
 static void debug_menu_loop(void)
 {
-	draw_debug();
-	wait_for_input(GP2X_B|GP2X_X);
+	int inp, mode = 0;
+
+	while (1)
+	{
+		switch (mode)
+		{
+			case 0: draw_main_debug(); break;
+			case 1: draw_frame_debug(); break;
+			case 2: gp2x_pd_clone_buffer2();
+				PicoDrawShowSpriteStats(gp2x_screen, 320); break;
+			case 3: memset(gp2x_screen, 0, 320*240*2);
+				PicoDrawShowPalette(gp2x_screen, 320); break;
+		}
+		menu_flip();
+
+		inp = wait_for_input(GP2X_B|GP2X_X|GP2X_L|GP2X_R|GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT);
+		if (inp & (GP2X_B|GP2X_X)) return;
+		if (inp & GP2X_L) { mode--; if (mode < 0) mode = 3; }
+		if (inp & GP2X_R) { mode++; if (mode > 3) mode = 0; }
+		if (mode == 1) {
+			if (inp & GP2X_LEFT)  PicoDrawMask ^= PDRAW_LAYERB_ON;
+			if (inp & GP2X_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;
+			if (inp & GP2X_DOWN)  PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;
+			if (inp & GP2X_UP)    PicoDrawMask ^= PDRAW_SPRITES_HI_ON;
+		}
+	}
 }
 
 // ------------ patch/gg menu ------------
@@ -569,7 +607,7 @@ static void draw_savestate_bg(int slot)
 		areaClose(file);
 	}
 
-	emu_forcedFrame();
+	emu_forcedFrame(POPT_EN_SOFTSCALE);
 	menu_prepare_bg(1);
 
 	memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));
@@ -1150,7 +1188,7 @@ menu_entry opt_entries[] =
 {
 	{ NULL,                        MB_NONE,  MA_OPT_RENDERER,      NULL, 0, 0, 0, 1, 1 },
 	{ NULL,                        MB_RANGE, MA_OPT_SCALING,       &currentConfig.scaling, 0, 0, 3, 1, 1 },
-	{ "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES,   &PicoOpt, 0x080, 0, 0, 1, 1 },
+	{ "Accurate sprites",          MB_ONOFF, MA_OPT_ACC_SPRITES,   &PicoOpt, 0x080, 0, 0, 0, 1 },
 	{ "Show FPS",                  MB_ONOFF, MA_OPT_SHOW_FPS,      &currentConfig.EmuOpt,  0x002, 0, 0, 1, 1 },
 	{ NULL,                        MB_RANGE, MA_OPT_FRAMESKIP,     &currentConfig.Frameskip, 0, -1, 16, 1, 1 },
 	{ "Enable sound",              MB_ONOFF, MA_OPT_ENABLE_SOUND,  &currentConfig.EmuOpt,  0x004, 0, 0, 1, 1 },