\r
\r
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
-unsigned char temp_frame[320 * 240 * 2];\r
-unsigned char *PicoDraw2FB = temp_frame;\r
-static int osd_fps_x;\r
-char cpu_clk_name[] = "unused";\r
-\r
-extern void update_screen(void);\r
+const char *renderer_names[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL };\r
+const char *renderer_names32x[] = { "accurate", "faster", "fastest", NULL };\r
+enum renderer_types { RT_16BIT, RT_8BIT_ACC, RT_8BIT_FAST, RT_COUNT };\r
\r
\r
void pemu_prep_defconfig(void)\r
{\r
- // XXX: move elsewhere\r
- g_menubg_ptr = temp_frame;\r
}\r
\r
void pemu_validate_config(void)\r
// FIXME: dupes from GP2X, need cleanup\r
static void (*osd_text)(int x, int y, const char *text);\r
\r
+/*\r
static void osd_text8(int x, int y, const char *text)\r
{\r
int len = strlen(text)*8;\r
}\r
emu_text_out8(x, y, text);\r
}\r
+*/\r
\r
static void osd_text16(int x, int y, const char *text)\r
{\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
+void pemu_finalize_frame(const char *fps, const char *notice)\r
{\r
- DrawLineDest = (unsigned short *)g_screen_ptr + num * g_screen_width;\r
-\r
- return 0;\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
-void pemu_update_display(const char *fps, const char *notice)\r
-{\r
if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {\r
if (notice)\r
osd_text(4, g_screen_height - 8, notice);\r
if (currentConfig.EmuOpt & EOPT_SHOW_FPS)\r
- osd_text(osd_fps_x, g_screen_height - 8, fps);\r
+ osd_text(g_screen_width - 60, g_screen_height - 8, fps);\r
}\r
if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
draw_cd_leds();\r
+}\r
+\r
+static void apply_renderer(void)\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
- update_screen();\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 is_next, int force_16bpp, int is_menu)\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
void plat_video_menu_begin(void)\r
{\r
- memcpy32(g_screen_ptr, g_menubg_ptr, g_screen_width * g_screen_height * 2 / 4);\r
+ g_menuscreen_ptr = g_screen_ptr;\r
}\r
\r
void plat_video_menu_end(void)\r
{\r
- update_screen();\r
+ plat_video_flip();\r
}\r
\r
void plat_status_msg_clear(void)\r
void plat_status_msg_busy_next(const char *msg)\r
{\r
plat_status_msg_clear();\r
- pemu_update_display("", msg);\r
+ pemu_finalize_frame("", msg);\r
+ plat_video_flip();\r
emu_status_msg("");\r
reset_timing = 1;\r
}\r
{\r
}\r
\r
-void pemu_forced_frame(int opts)\r
+void pemu_forced_frame(int no_scale, int do_emu)\r
{\r
- int po_old = PicoOpt;\r
- int eo_old = currentConfig.EmuOpt;\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
-\r
+ PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
+ PicoDraw32xSetFrameMode(0, 0);\r
+ PicoDrawSetCallbacks(NULL, NULL);\r
Pico.m.dirtyPal = 1;\r
- PicoFrameDrawOnly();\r
\r
- PicoOpt = po_old;\r
- currentConfig.EmuOpt = eo_old;\r
+ emu_cmn_forced_frame(no_scale, do_emu);\r
+\r
+ g_menubg_src_ptr = g_screen_ptr;\r
}\r
\r
-static void updateSound(int len)\r
+static void oss_write_nonblocking(int len)\r
{\r
- len <<= 1;\r
- if (PicoOpt & POPT_EN_STEREO)\r
- len <<= 1;\r
-\r
+ // sndout_oss_can_write() is not reliable, only use with no_frmlimit\r
if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len))\r
return;\r
\r
- /* avoid writing audio when lagging behind to prevent audio lag */\r
- if (PicoSkipFrame != 2)\r
- sndout_oss_write(PsndOut, len);\r
+ sndout_oss_write_nb(PsndOut, len);\r
}\r
\r
void pemu_sound_start(void)\r
{\r
- static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;\r
- int target_fps = Pico.m.pal ? 50 : 60;\r
-\r
PsndOut = NULL;\r
\r
if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
{\r
- int snd_excess_add;\r
- if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old)\r
- PsndRerate(Pico.m.frame_count ? 1 : 0);\r
-\r
- snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;\r
- printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",\r
- PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);\r
- sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3);\r
+ int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
+\r
+ PsndRerate(Pico.m.frame_count ? 1 : 0);\r
+\r
+ printf("starting audio: %i len: %i stereo: %i, pal: %i\n",\r
+ PsndRate, PsndLen, is_stereo, Pico.m.pal);\r
+ sndout_oss_start(PsndRate, is_stereo, 1);\r
sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
- PicoWriteSound = updateSound;\r
+ PicoWriteSound = oss_write_nonblocking;\r
plat_update_volume(0, 0);\r
memset(sndBuffer, 0, sizeof(sndBuffer));\r
PsndOut = sndBuffer;\r
- PsndRate_old = PsndRate;\r
- PicoOpt_old = PicoOpt;\r
- pal_old = Pico.m.pal;\r
}\r
}\r
\r
\r
void emu_video_mode_change(int start_line, int line_count, int is_32cols)\r
{\r
- osd_fps_x = 260;\r
-\r
// clear whole screen in all buffers\r
memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
}\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
\r
void pemu_loop_end(void)\r
{\r
- int po_old = PicoOpt;\r
- int eo_old = currentConfig.EmuOpt;\r
-\r
pemu_sound_stop();\r
- memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
\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
- Pico.m.dirtyPal = 1;\r
- PicoFrame();\r
-\r
- PicoOpt = po_old;\r
- currentConfig.EmuOpt = eo_old;\r
+ pemu_forced_frame(0, 1);\r
}\r
\r
void plat_wait_till_us(unsigned int us_to)\r
}\r
}\r
\r
-void plat_video_wait_vsync(void)\r
-{\r
-}\r
-\r
-const char *plat_get_credits(void)\r
-{\r
- return "PicoDrive v" VERSION " (c) notaz, 2006-2009\n\n\n"\r
- "Credits:\n"\r
- "fDave: Cyclone 68000 core,\n"\r
- " base code of PicoDrive\n"\r
- "Reesy & FluBBa: DrZ80 core\n"\r
- "MAME devs: YM2612 and SN76496 cores\n"\r
- "rlyeh and others: minimal SDK\n"\r
- "Squidge: mmuhack\n"\r
- "Dzz: ARM940 sample\n"\r
- "GnoStiC / Puck2099: USB joy code\n"\r
- "craigix: GP2X hardware\n"\r
- "ketchupgun: skin design\n"\r
- "\n"\r
- "special thanks (for docs, ideas):\n"\r
- " Charles MacDonald, Haze,\n"\r
- " Stephane Dallongeville,\n"\r
- " Lordus, Exophase, Rokas,\n"\r
- " Nemesis, Tasco Deluxe";\r
-}\r
notaz.gp2x.de / libpicofe.git / blobdiff