\r
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
char cpu_clk_name[] = "unused";\r
+const char *renderer_names_[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL };\r
+const char *renderer_names32x_[] = { "accurate", "faster ", "fastest ", NULL };\r
+const char **renderer_names = renderer_names_;\r
+const char **renderer_names32x = renderer_names32x_;\r
+enum renderer_types { RT_16BIT, RT_8BIT_ACC, RT_8BIT_FAST, RT_COUNT };\r
\r
\r
void pemu_prep_defconfig(void)\r
led_offs = 4;\r
scr_offs = pitch * 2 + 4;\r
\r
- if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) {\r
+ if (currentConfig.renderer != RT_16BIT) {\r
#define p(x) px[(x) >> 2]\r
// 8-bit modes\r
unsigned int *px = (unsigned int *)((char *)g_screen_ptr + scr_offs);\r
}\r
}\r
\r
-static int EmuScanBegin16(unsigned int num)\r
-{\r
- DrawLineDest = (unsigned short *)g_screen_ptr + num * g_screen_width;\r
-\r
- return 0;\r
-}\r
-\r
void pemu_finalize_frame(const char *fps, const char *notice)\r
{\r
+ if (currentConfig.renderer != RT_16BIT && !(PicoAHW & PAHW_32X)) {\r
+ unsigned short *pd = (unsigned short *)g_screen_ptr + 8 * g_screen_width;\r
+ unsigned char *ps = PicoDraw2FB + 328*8 + 8;\r
+ unsigned short *pal = HighPal;\r
+ int i, x;\r
+ if (Pico.m.dirtyPal)\r
+ PicoDrawUpdateHighPal();\r
+ for (i = 0; i < 224; i++, ps += 8)\r
+ for (x = 0; x < 320; x++)\r
+ *pd++ = pal[*ps++];\r
+ }\r
+\r
if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {\r
if (notice)\r
osd_text(4, g_screen_height - 8, notice);\r
draw_cd_leds();\r
}\r
\r
-void plat_video_toggle_renderer(int is_next, int force_16bpp, int is_menu)\r
+static void apply_renderer(void)\r
+{\r
+ PicoScanBegin = NULL;\r
+ PicoScanEnd = NULL;\r
+\r
+ switch (currentConfig.renderer) {\r
+ case RT_16BIT:\r
+ PicoOpt &= ~POPT_ALT_RENDERER;\r
+ PicoDrawSetOutFormat(PDF_RGB555, 0);\r
+ PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
+ break;\r
+ case RT_8BIT_ACC:\r
+ PicoOpt &= ~POPT_ALT_RENDERER;\r
+ PicoDrawSetOutFormat(PDF_8BIT, 0);\r
+ PicoDrawSetOutBuf(PicoDraw2FB + 8, 328);\r
+ break;\r
+ case RT_8BIT_FAST:\r
+ PicoOpt |= POPT_ALT_RENDERER;\r
+ PicoDrawSetOutFormat(PDF_NONE, 0);\r
+ break;\r
+ }\r
+\r
+ if (PicoAHW & PAHW_32X) {\r
+ int only_32x = 0;\r
+ if (currentConfig.renderer == RT_16BIT)\r
+ only_32x = 1;\r
+ else\r
+ PicoDrawSetOutFormat(PDF_NONE, 0);\r
+ PicoDraw32xSetFrameMode(1, only_32x);\r
+ PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
+ }\r
+ //PicoDraw32xSetFrameMode(0, 0);\r
+ //PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+}\r
+\r
+void plat_video_toggle_renderer(int change, int is_menu)\r
{\r
- // this will auto-select SMS/32X renderers\r
- PicoDrawSetColorFormat(1);\r
+ currentConfig.renderer += change;\r
+ if (currentConfig.renderer >= RT_COUNT)\r
+ currentConfig.renderer = 0;\r
+ else if (currentConfig.renderer < 0)\r
+ currentConfig.renderer = RT_COUNT - 1;\r
+\r
+ if (!is_menu)\r
+ apply_renderer();\r
+\r
+ emu_status_msg(renderer_names[currentConfig.renderer]);\r
}\r
\r
void plat_video_menu_enter(int is_rom_loaded)\r
\r
PicoOpt &= ~POPT_ALT_RENDERER;\r
PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites\r
- currentConfig.EmuOpt |= EOPT_16BPP;\r
\r
- PicoDrawSetColorFormat(1);\r
- PicoScanBegin = EmuScanBegin16;\r
+ PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+ PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
+ PicoDraw32xSetFrameMode(0, 0);\r
\r
Pico.m.dirtyPal = 1;\r
PicoFrameDrawOnly();\r
\r
void pemu_loop_prep(void)\r
{\r
- PicoDrawSetColorFormat(1);\r
- PicoScanBegin = EmuScanBegin16;\r
+ apply_renderer();\r
osd_text = osd_text16;\r
\r
pemu_sound_start();\r
/* do one more frame for menu bg */\r
PicoOpt &= ~POPT_ALT_RENDERER;\r
PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;\r
- currentConfig.EmuOpt |= EOPT_16BPP;\r
\r
- PicoDrawSetColorFormat(1);\r
+ PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+ PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
+ PicoDraw32xSetFrameMode(0, 0);\r
Pico.m.dirtyPal = 1;\r
PicoFrame();\r
\r