static short __attribute__((aligned(4))) sndBuffer[2*(44100+100)/50];\r
static unsigned char PicoDraw2FB_[(8+320) * (8+240+8)];\r
unsigned char *PicoDraw2FB = PicoDraw2FB_;\r
-static int osd_fps_x, osd_y;\r
+static int osd_fps_x, osd_y, doing_bg_frame;\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
-extern void *gp2x_screens[4];\r
-\r
+static int (*emu_scan_begin)(unsigned int num) = NULL;\r
+static int (*emu_scan_end)(unsigned int num) = NULL;\r
\r
-static void scaling_update(void)\r
-{\r
- PicoOpt &= ~(POPT_DIS_32C_BORDER|POPT_EN_SOFTSCALE);\r
- switch (currentConfig.scaling) {\r
- default:break;\r
- case EOPT_SCALE_HW_H:\r
- case EOPT_SCALE_HW_HV:\r
- PicoOpt |= POPT_DIS_32C_BORDER;\r
- break;\r
- case EOPT_SCALE_SW_H:\r
- PicoOpt |= POPT_EN_SOFTSCALE;\r
- break;\r
- }\r
-}\r
+extern void *gp2x_screens[4];\r
\r
\r
void pemu_prep_defconfig(void)\r
\r
void pemu_validate_config(void)\r
{\r
- gp2x_soc_t soc;\r
-\r
- soc = soc_detect();\r
- if (soc != SOCID_MMSP2)\r
+ if (gp2x_dev_id != GP2X_DEV_GP2X)\r
PicoOpt &= ~POPT_EXT_FM;\r
- if (soc != SOCID_POLLUX)\r
+ if (gp2x_dev_id != GP2X_DEV_WIZ)\r
currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX;\r
\r
if (currentConfig.gamma < 10 || currentConfig.gamma > 300)\r
else\r
r = ¤tConfig.renderer;\r
*r += diff;\r
+\r
+ // 8bpp fast is not there (yet?)\r
+ if ((PicoAHW & PAHW_SMS) && *r == RT_8BIT_FAST)\r
+ (*r)++;\r
+\r
if (*r >= RT_COUNT)\r
*r = 0;\r
else if (*r < 0)\r
return 0;\r
}\r
\r
+/* line doublers */\r
+static unsigned int ld_counter;\r
+static int ld_left, ld_lines;\r
+\r
+static int EmuScanBegin16_ld(unsigned int num)\r
+{\r
+ if ((signed int)(ld_counter - num) > 100)\r
+ ld_counter = 0;\r
+\r
+ if (emu_scan_begin)\r
+ return emu_scan_begin(ld_counter);\r
+ else\r
+ DrawLineDest = (char *)g_screen_ptr + 320 * ld_counter * gp2x_current_bpp / 8;\r
+\r
+ return 0;\r
+}\r
+\r
+static int EmuScanEnd16_ld(unsigned int num)\r
+{\r
+ void *oldline = DrawLineDest;\r
+\r
+ if (emu_scan_end)\r
+ emu_scan_end(ld_counter);\r
+\r
+ ld_counter++;\r
+ ld_left--;\r
+ if (ld_left <= 0) {\r
+ ld_left = ld_lines;\r
+\r
+ EmuScanBegin16_ld(num);\r
+ memcpy32(DrawLineDest, oldline, 320 * gp2x_current_bpp / 8 / 4);\r
+ if (emu_scan_end)\r
+ emu_scan_end(ld_counter);\r
+\r
+ ld_counter++;\r
+ }\r
+\r
+ return 0;\r
+}\r
+\r
static int localPal[0x100];\r
static void (*vidcpyM2)(void *dest, void *src, int m32col, int with_32c_border);\r
static int (*make_local_pal)(int fast_mode);\r
}\r
}\r
\r
- if (notice || (emu_opt & EOPT_SHOW_FPS)) {\r
- if (notice)\r
- osd_text(4, osd_y, notice);\r
- if (emu_opt & 2)\r
- osd_text(osd_fps_x, osd_y, fps);\r
- }\r
+ if (notice)\r
+ osd_text(4, osd_y, notice);\r
+ if (emu_opt & EOPT_SHOW_FPS)\r
+ osd_text(osd_fps_x, osd_y, fps);\r
if ((PicoAHW & PAHW_MCD) && (emu_opt & EOPT_EN_CD_LEDS))\r
draw_cd_leds();\r
if (PicoAHW & PAHW_PICO)\r
plat_status_msg_busy_next(msg);\r
}\r
\r
-static void vidResetMode(void)\r
+static void vid_reset_mode(void)\r
{\r
int gp2x_mode = 16;\r
int renderer = get_renderer();\r
\r
- PicoScanBegin = NULL;\r
- PicoScanEnd = NULL;\r
+ PicoOpt &= ~POPT_ALT_RENDERER;\r
+ emu_scan_begin = NULL;\r
+ emu_scan_end = NULL;\r
\r
switch (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
- if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
- PicoScanBegin = EmuScanBegin16_rot;\r
- PicoScanEnd = EmuScanEnd16_rot;\r
- }\r
break;\r
case RT_8BIT_ACC:\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
PicoDrawSetOutFormat(PDF_8BIT, 0);\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width);\r
- if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
- PicoScanBegin = EmuScanBegin8_rot;\r
- PicoScanEnd = EmuScanEnd8_rot;\r
- }\r
gp2x_mode = 8;\r
break;\r
case RT_8BIT_FAST:\r
- PicoOpt |= POPT_ALT_RENDERER;\r
+ PicoOpt |= POPT_ALT_RENDERER;\r
PicoDrawSetOutFormat(PDF_NONE, 0);\r
- if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)\r
- vidcpyM2 = vidcpy_m2_rot;\r
- else\r
- vidcpyM2 = vidcpy_m2;\r
+ vidcpyM2 = vidcpy_m2;\r
gp2x_mode = 8;\r
break;\r
+ default:\r
+ printf("bad renderer\n");\r
+ break;\r
}\r
\r
- if (is_16bit_mode())\r
- osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16;\r
- else\r
- osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;\r
-\r
if (PicoAHW & PAHW_32X) {\r
- // rules change in 32X world\r
- if (renderer != RT_16BIT) {\r
- PicoDrawSetOutFormat(PDF_NONE, 0);\r
- PicoScanBegin = NULL;\r
- PicoScanEnd = NULL;\r
- }\r
- PicoScan32xBegin = NULL;\r
- PicoScan32xEnd = NULL;\r
- if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
- PicoScan32xBegin = EmuScanBegin16_rot;\r
- PicoScan32xEnd = EmuScanEnd16_rot;\r
- }\r
// Wiz 16bit is an exception, uses line rendering due to rotation mess\r
if (renderer == RT_16BIT && (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)) {\r
PicoDrawSetOutFormat(PDF_RGB555, 1);\r
PicoDraw32xSetFrameMode(0, 0);\r
}\r
else {\r
+ PicoDrawSetOutFormat(PDF_NONE, 0);\r
PicoDraw32xSetFrameMode(1, (renderer == RT_16BIT) ? 1 : 0);\r
}\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
- gp2x_mode = 16;\r
}\r
\r
+ if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+ if ((PicoAHW & PAHW_32X) || renderer == RT_16BIT) {\r
+ emu_scan_begin = EmuScanBegin16_rot;\r
+ emu_scan_end = EmuScanEnd16_rot;\r
+ }\r
+ else if (renderer == RT_8BIT_ACC) {\r
+ emu_scan_begin = EmuScanBegin8_rot;\r
+ emu_scan_end = EmuScanEnd8_rot;\r
+ }\r
+ else if (renderer == RT_8BIT_FAST)\r
+ vidcpyM2 = vidcpy_m2_rot;\r
+ }\r
+\r
+ PicoDrawSetCallbacks(emu_scan_begin, emu_scan_end);\r
+\r
+ if (is_16bit_mode())\r
+ osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16;\r
+ else\r
+ osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;\r
+\r
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)\r
gp2x_mode = -gp2x_mode;\r
+\r
+ gp2x_video_wait_vsync();\r
gp2x_video_changemode(gp2x_mode);\r
\r
if (!is_16bit_mode()) {\r
localPal[0xf0] = 0x00ffffff;\r
gp2x_video_setpalette(localPal, 0x100);\r
gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
- gp2x_video_flip();\r
}\r
+ else\r
+ gp2x_memset_all_buffers(0, 0, 320*240*2);\r
+\r
Pico.m.dirtyPal = 1;\r
\r
- // reset scaling\r
- if (currentConfig.scaling == EOPT_SCALE_HW_HV && !(Pico.video.reg[1]&8))\r
- gp2x_video_RGB_setscaling(8, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 224);\r
- else gp2x_video_RGB_setscaling(0, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 240);\r
+ PicoOpt &= ~POPT_EN_SOFTSCALE;\r
+ if (currentConfig.scaling == EOPT_SCALE_SW)\r
+ PicoOpt |= POPT_EN_SOFTSCALE;\r
\r
// palette converters for 8bit modes\r
make_local_pal = (PicoAHW & PAHW_SMS) ? make_local_pal_sms : make_local_pal_md;\r
}\r
\r
+void emu_video_mode_change(int start_line, int line_count, int is_32cols)\r
+{\r
+ int scalex = 320, scaley = 240;\r
+ int ln_offs = 0;\r
+\r
+ if (doing_bg_frame)\r
+ return;\r
+\r
+ osd_fps_x = OSD_FPS_X;\r
+ osd_y = 232;\r
+\r
+ /* set up hwscaling here */\r
+ PicoOpt &= ~POPT_DIS_32C_BORDER;\r
+ if (is_32cols && currentConfig.scaling == EOPT_SCALE_HW) {\r
+ scalex = 256;\r
+ PicoOpt |= POPT_DIS_32C_BORDER;\r
+ osd_fps_x = OSD_FPS_X - 64;\r
+ }\r
+\r
+ if (currentConfig.vscaling == EOPT_SCALE_HW) {\r
+ ln_offs = start_line;\r
+ scaley = line_count;\r
+ osd_y = start_line + line_count - 8;\r
+ }\r
+\r
+ gp2x_video_RGB_setscaling(ln_offs, scalex, scaley);\r
+\r
+ /* line doubling */\r
+ if (currentConfig.vscaling == EOPT_SCALE_SW && line_count < 240) {\r
+ ld_lines = ld_left = line_count / (240 - line_count);\r
+ PicoDrawSetCallbacks(EmuScanBegin16_ld, EmuScanEnd16_ld);\r
+ }\r
+\r
+ // clear whole screen in all buffers\r
+ if (!is_16bit_mode())\r
+ gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
+ else\r
+ gp2x_memset_all_buffers(0, 0, 320*240*2);\r
+}\r
+\r
void plat_video_toggle_renderer(int change, int is_menu_call)\r
{\r
change_renderer(change);\r
if (is_menu_call)\r
return;\r
\r
- vidResetMode();\r
+ vid_reset_mode();\r
rendstatus_old = -1;\r
\r
if (PicoAHW & PAHW_32X)\r
// don't need to do anything, writes will block by themselves\r
}\r
\r
-\r
void pemu_forced_frame(int opts, int no_scale)\r
{\r
int po_old = PicoOpt;\r
\r
+ doing_bg_frame = 1;\r
PicoOpt &= ~POPT_ALT_RENDERER;\r
PicoOpt |= opts|POPT_ACC_SPRITES;\r
\r
+ memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
+\r
PicoDrawSetOutFormat(PDF_RGB555, 1);\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
PicoDraw32xSetFrameMode(0, 0);\r
- PicoScanBegin = NULL;\r
- PicoScanEnd = NULL;\r
+ PicoDrawSetCallbacks(NULL, NULL);\r
Pico.m.dirtyPal = 1;\r
- PicoFrameDrawOnly();\r
\r
+ if (no_scale == -9)\r
+ // yes I'm lazy, see pemu_forced_frame call below\r
+ PicoFrame();\r
+ else\r
+ PicoFrameDrawOnly();\r
+\r
+ doing_bg_frame = 0;\r
PicoOpt = po_old;\r
}\r
\r
{\r
}\r
\r
-void emu_video_mode_change(int start_line, int line_count, int is_32cols)\r
-{\r
- int scalex = 320;\r
- osd_fps_x = OSD_FPS_X;\r
- osd_y = 232;\r
- if (is_32cols && (PicoOpt & POPT_DIS_32C_BORDER)) {\r
- scalex = 256;\r
- osd_fps_x = OSD_FPS_X - 64;\r
- }\r
-\r
- /* want vertical scaling and game is not in 240 line mode */\r
- if (currentConfig.scaling == EOPT_SCALE_HW_HV) {\r
- gp2x_video_RGB_setscaling(start_line, scalex, line_count);\r
- osd_y = start_line + line_count - 8;\r
- } else\r
- gp2x_video_RGB_setscaling(0, scalex, 240);\r
-\r
- // clear whole screen in all buffers\r
- if (!is_16bit_mode())\r
- gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
- else\r
- gp2x_memset_all_buffers(0, 0, 320*240*2);\r
-}\r
-\r
#if 0\r
static void tga_dump(void)\r
{\r
\r
if (gp2x_old_clock < 0)\r
gp2x_old_clock = default_cpu_clock;\r
- if (gp2x_old_clock != currentConfig.CPUclock) {\r
+ if (gp2x_old_clock != currentConfig.CPUclock && gp2x_set_cpuclk != NULL) {\r
printf("changing clock to %i...", currentConfig.CPUclock); fflush(stdout);\r
gp2x_set_cpuclk(currentConfig.CPUclock);\r
gp2x_old_clock = currentConfig.CPUclock;\r
pal_old = Pico.m.pal;\r
\r
// make sure we are in correct mode\r
- vidResetMode();\r
- scaling_update();\r
+ change_renderer(0);\r
+ vid_reset_mode();\r
\r
// dirty buffers better go now than during gameplay\r
sync();\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, 320*240*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
-\r
- PicoDrawSetOutFormat(PDF_RGB555, 1);\r
- PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
- PicoDraw32xSetFrameMode(0, 0);\r
- PicoScanBegin = NULL;\r
- PicoScanEnd = NULL;\r
- Pico.m.dirtyPal = 1;\r
- PicoFrame();\r
-\r
- PicoOpt = po_old;\r
- currentConfig.EmuOpt = eo_old;\r
+ pemu_forced_frame(POPT_EN_SOFTSCALE, -9);\r
+ g_menubg_src_ptr = g_screen_ptr;\r
}\r
\r
const char *plat_get_credits(void)\r
notaz.gp2x.de / libpicofe.git / blobdiff