\r
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
static struct timeval noticeMsgTime = { 0, 0 }; // when started showing\r
-static int osd_fps_x;\r
-static int gp2x_old_gamma = 100;\r
static char noticeMsg[40];\r
static unsigned char PicoDraw2FB_[(8+320) * (8+240+8)];\r
unsigned char *PicoDraw2FB = PicoDraw2FB_;\r
+static int osd_fps_x;\r
\r
+extern void *gp2x_screens[4];\r
\r
void plat_status_msg(const char *format, ...)\r
{\r
gp2x_soc_t soc;\r
\r
memset(&defaultConfig, 0, sizeof(defaultConfig));\r
- defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS | 0x600; // | <- confirm_save, cd_leds\r
+ defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS|EOPT_CONFIRM_SAVE|EOPT_EN_CD_LEDS;\r
defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES;\r
defaultConfig.s_PsndRate = 44100;\r
defaultConfig.s_PicoRegion = 0; // auto\r
soc = soc_detect();\r
if (soc == SOCID_MMSP2)\r
defaultConfig.s_PicoOpt |= POPT_EXT_FM;\r
+ else if (soc == SOCID_POLLUX)\r
+ defaultConfig.EmuOpt |= EOPT_WIZ_TEAR_FIX;\r
}\r
\r
-static void osd_text(int x, int y, const char *text)\r
+static void (*osd_text)(int x, int y, const char *text);\r
+\r
+static void osd_text8(int x, int y, const char *text)\r
{\r
int len = strlen(text)*8;\r
int *p, i, h, offs;\r
\r
- if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
- len = (len+3) >> 2;\r
- for (h = 0; h < 8; h++) {\r
- offs = (x + g_screen_width * (y+h)) & ~3;\r
- p = (int *) ((char *)g_screen_ptr + offs);\r
- for (i = len; i; i--, p++)\r
- *p = 0xe0e0e0e0;\r
- }\r
- emu_textOut8(x, y, text);\r
- } else {\r
- len = (len+1) >> 1;\r
- for (h = 0; h < 8; h++) {\r
- offs = (x + g_screen_width * (y+h)) & ~1;\r
- p = (int *) ((short *)g_screen_ptr + offs);\r
- for (i = len; i; i--, p++)\r
- *p = (*p >> 2) & 0x39e7;\r
- }\r
- emu_textOut16(x, y, text);\r
+ len = (len+3) >> 2;\r
+ for (h = 0; h < 8; h++) {\r
+ offs = (x + g_screen_width * (y+h)) & ~3;\r
+ p = (int *) ((char *)g_screen_ptr + offs);\r
+ for (i = len; i; i--, p++)\r
+ *p = 0xe0e0e0e0;\r
+ }\r
+ emu_text_out8(x, y, text);\r
+}\r
+\r
+static void osd_text16(int x, int y, const char *text)\r
+{\r
+ int len = strlen(text)*8;\r
+ int *p, i, h, offs;\r
+\r
+ len = (len+1) >> 1;\r
+ for (h = 0; h < 8; h++) {\r
+ offs = (x + g_screen_width * (y+h)) & ~1;\r
+ p = (int *) ((short *)g_screen_ptr + offs);\r
+ for (i = len; i; i--, p++)\r
+ *p = (*p >> 2) & 0x39e7;\r
+ }\r
+ emu_text_out16(x, y, text);\r
+}\r
+\r
+static void osd_text8_rot(int x, int y, const char *text)\r
+{\r
+ int len = strlen(text) * 8;\r
+ char *p = (char *)g_screen_ptr + 240*(320-x) + y;\r
+\r
+ while (len--) {\r
+ memset(p, 0xe0, 8);\r
+ p -= 240;\r
}\r
+\r
+ emu_text_out8_rot(x, y, text);\r
+}\r
+\r
+static void osd_text16_rot(int x, int y, const char *text)\r
+{\r
+ int len = strlen(text) * 8;\r
+ short *p = (short *)g_screen_ptr + 240*(320-x) + y;\r
+\r
+ while (len--) {\r
+ memset(p, 0, 8*2);\r
+ p -= 240;\r
+ }\r
+\r
+ emu_text_out16_rot(x, y, text);\r
}\r
\r
static void draw_cd_leds(void)\r
{\r
- int old_reg;\r
- old_reg = Pico_mcd->s68k_regs[0];\r
+ int led_reg, pitch, scr_offs, led_offs;\r
+ led_reg = Pico_mcd->s68k_regs[0];\r
+\r
+ if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+ pitch = 240;\r
+ led_offs = -pitch * 6;\r
+ scr_offs = pitch * (320 - 4);\r
+ } else {\r
+ pitch = 320;\r
+ led_offs = 4;\r
+ scr_offs = pitch * 2 + 4;\r
+ }\r
\r
if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) {\r
+ #define p(x) px[(x) >> 2]\r
// 8-bit modes\r
- unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;\r
- unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;\r
- *(unsigned int *)((char *)g_screen_ptr + 320*2+ 4) =\r
- *(unsigned int *)((char *)g_screen_ptr + 320*3+ 4) =\r
- *(unsigned int *)((char *)g_screen_ptr + 320*4+ 4) = col_g;\r
- *(unsigned int *)((char *)g_screen_ptr + 320*2+12) =\r
- *(unsigned int *)((char *)g_screen_ptr + 320*3+12) =\r
- *(unsigned int *)((char *)g_screen_ptr + 320*4+12) = col_r;\r
+ unsigned int *px = (unsigned int *)((char *)g_screen_ptr + scr_offs);\r
+ unsigned int col_g = (led_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;\r
+ unsigned int col_r = (led_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;\r
+ p(pitch*0) = p(pitch*1) = p(pitch*2) = col_g;\r
+ p(pitch*0 + led_offs) = p(pitch*1 + led_offs) = p(pitch*2 + led_offs) = col_r;\r
+ #undef p\r
} else {\r
+ #define p(x) px[(x)*2 >> 2] = px[((x)*2 >> 2) + 1]\r
// 16-bit modes\r
- unsigned int *p = (unsigned int *)((short *)g_screen_ptr + 320*2+4);\r
- unsigned int col_g = (old_reg & 2) ? 0x06000600 : 0;\r
- unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0;\r
- *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
- *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
- *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;\r
+ unsigned int *px = (unsigned int *)((short *)g_screen_ptr + scr_offs);\r
+ unsigned int col_g = (led_reg & 2) ? 0x06000600 : 0;\r
+ unsigned int col_r = (led_reg & 1) ? 0xc000c000 : 0;\r
+ p(pitch*0) = p(pitch*1) = p(pitch*2) = col_g;\r
+ p(pitch*0 + led_offs) = p(pitch*1 + led_offs) = p(pitch*2 + led_offs) = col_r;\r
+ #undef p\r
}\r
}\r
\r
static void draw_pico_ptr(void)\r
{\r
unsigned short *p = (unsigned short *)g_screen_ptr;\r
+ int x, y, pitch = 320;\r
\r
// only if pen enabled and for 16bit modes\r
- if (pico_inp_mode == 0 || (PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) return;\r
+ if (pico_inp_mode == 0 || (PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP))\r
+ return;\r
\r
- if (!(Pico.video.reg[12]&1) && !(PicoOpt&POPT_DIS_32C_BORDER))\r
- p += 32;\r
+ x = pico_pen_x + PICO_PEN_ADJUST_X;\r
+ y = pico_pen_y + PICO_PEN_ADJUST_Y;\r
+ if (!(Pico.video.reg[12]&1) && !(PicoOpt & POPT_DIS_32C_BORDER))\r
+ x += 32;\r
\r
- p += 320 * (pico_pen_y + PICO_PEN_ADJUST_Y);\r
- p += pico_pen_x + PICO_PEN_ADJUST_X;\r
- p[0] ^= 0xffff;\r
- p[319] ^= 0xffff;\r
- p[320] ^= 0xffff;\r
- p[321] ^= 0xffff;\r
- p[640] ^= 0xffff;\r
+ if (EOPT_WIZ_TEAR_FIX) {\r
+ pitch = 240;\r
+ p += (319 - x) * pitch + y;\r
+ } else\r
+ p += x + y * pitch;\r
+\r
+ p[0] ^= 0xffff;\r
+ p[pitch-1] ^= 0xffff;\r
+ p[pitch] ^= 0xffff;\r
+ p[pitch+1] ^= 0xffff;\r
+ p[pitch*2] ^= 0xffff;\r
}\r
\r
static int EmuScanBegin16(unsigned int num)\r
return 0;\r
}\r
\r
+/* rot thing for Wiz */\r
+static unsigned char __attribute__((aligned(4))) rot_buff[320*4*2];\r
+\r
+static int EmuScanBegin16_rot(unsigned int num)\r
+{\r
+ DrawLineDest = rot_buff + (num & 3) * 320 * 2;\r
+ return 0;\r
+}\r
+\r
+static int EmuScanEnd16_rot(unsigned int num)\r
+{\r
+ if ((num & 3) != 3)\r
+ return 0;\r
+ if (!(Pico.video.reg[1] & 8))\r
+ num += 8;\r
+ rotated_blit16(g_screen_ptr, rot_buff, num + 1,\r
+ !(Pico.video.reg[12] & 1) && !(PicoOpt & POPT_EN_SOFTSCALE));\r
+ return 0;\r
+}\r
+\r
+static int EmuScanBegin8_rot(unsigned int num)\r
+{\r
+ DrawLineDest = rot_buff + (num & 3) * 320;\r
+ return 0;\r
+}\r
+\r
+static int EmuScanEnd8_rot(unsigned int num)\r
+{\r
+ if ((num & 3) != 3)\r
+ return 0;\r
+ if (!(Pico.video.reg[1] & 8))\r
+ num += 8;\r
+ rotated_blit8(g_screen_ptr, rot_buff, num + 1,\r
+ !(Pico.video.reg[12] & 1));\r
+ return 0;\r
+}\r
+\r
int localPal[0x100];\r
-static void (*vidCpyM2)(void *dest, void *src) = NULL;\r
+static void (*vidcpyM2)(void *dest, void *src, int m32col, int with_32c_border) = NULL;\r
\r
static void blit(const char *fps, const char *notice)\r
{\r
if (PicoRead16Hook == PicoSVPRead16)\r
memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);\r
// do actual copy\r
- vidCpyM2((unsigned char *)g_screen_ptr+320*8, PicoDraw2FB+328*8);\r
+ vidcpyM2(g_screen_ptr, PicoDraw2FB+328*8,\r
+ !(Pico.video.reg[12] & 1), !(PicoOpt & POPT_DIS_32C_BORDER));\r
}\r
else if (!(emu_opt & EOPT_16BPP))\r
{\r
draw_pico_ptr();\r
\r
gp2x_video_flip();\r
-\r
- if (!(PicoOpt & POPT_ALT_RENDERER)) {\r
- if (!(Pico.video.reg[1]&8)) {\r
- if (currentConfig.EmuOpt & EOPT_16BPP)\r
- DrawLineDest = (unsigned short *) g_screen_ptr + 320*8;\r
- else\r
- DrawLineDest = (unsigned char *) g_screen_ptr + 320*8;\r
- } else {\r
- DrawLineDest = g_screen_ptr;\r
- }\r
- }\r
}\r
\r
// clears whole screen or just the notice area (in all buffers)\r
static void clearArea(int full)\r
{\r
- if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
+ int is_8bit = (PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP);\r
+ if (!full && (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)) {\r
+ /* ugh.. */\r
+ int i, u, *p;\r
+ if (is_8bit) {\r
+ for (i = 0; i < 4; i++) {\r
+ p = (int *)gp2x_screens[i] + (240-8) / 4;\r
+ for (u = 320; u > 0; u--, p += 240/4)\r
+ p[0] = p[1] = 0xe0e0e0e0;\r
+ }\r
+ } else {\r
+ for (i = 0; i < 4; i++) {\r
+ p = (int *)gp2x_screens[i] + (240-8)*2 / 4;\r
+ for (u = 320; u > 0; u--, p += 240*2/4)\r
+ p[0] = p[1] = p[2] = p[3] = 0;\r
+ }\r
+ }\r
+ return;\r
+ }\r
+\r
+ if (is_8bit) {\r
// 8-bit renderers\r
if (full) gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
else gp2x_memset_all_buffers(320*232, 0xe0, 320*8);\r
\r
static void vidResetMode(void)\r
{\r
+ PicoScanEnd = NULL;\r
+\r
if (PicoOpt & POPT_ALT_RENDERER) {\r
- gp2x_video_changemode(8);\r
- } else if (currentConfig.EmuOpt & EOPT_16BPP) {\r
- gp2x_video_changemode(16);\r
+ if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+ gp2x_video_changemode(-8);\r
+ vidcpyM2 = vidcpy_m2_rot;\r
+ osd_text = osd_text8_rot;\r
+ } else {\r
+ gp2x_video_changemode(8);\r
+ vidcpyM2 = vidcpy_m2;\r
+ osd_text = osd_text8;\r
+ }\r
+ }\r
+ else if (currentConfig.EmuOpt & EOPT_16BPP) {\r
PicoDrawSetColorFormat(1);\r
- PicoScanBegin = EmuScanBegin16;\r
- } else {\r
- gp2x_video_changemode(8);\r
+ if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+ gp2x_video_changemode(-16);\r
+ PicoScanBegin = EmuScanBegin16_rot;\r
+ PicoScanEnd = EmuScanEnd16_rot;\r
+ osd_text = osd_text16_rot;\r
+ } else {\r
+ gp2x_video_changemode(16);\r
+ PicoScanBegin = EmuScanBegin16;\r
+ osd_text = osd_text16;\r
+ }\r
+ }\r
+ else {\r
PicoDrawSetColorFormat(2);\r
- PicoScanBegin = EmuScanBegin8;\r
+ if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+ gp2x_video_changemode(-8);\r
+ PicoScanBegin = EmuScanBegin8_rot;\r
+ PicoScanEnd = EmuScanEnd8_rot;\r
+ osd_text = osd_text8_rot;\r
+ } else {\r
+ gp2x_video_changemode(8);\r
+ PicoScanBegin = EmuScanBegin8;\r
+ osd_text = osd_text8;\r
+ }\r
}\r
+\r
if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) {\r
// setup pal for 8-bit modes\r
localPal[0xc0] = 0x0000c000; // MCD LEDs\r
gp2x_video_flip();\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
\r
PicoDrawSetColorFormat(1);\r
PicoScanBegin = EmuScanBegin16;\r
+ PicoScanEnd = NULL;\r
Pico.m.dirtyPal = 1;\r
PicoFrameDrawOnly();\r
\r
-/*\r
- if (!(Pico.video.reg[12]&1)) {\r
- vidCpyM2 = vidCpyM2_32col;\r
- clearArea(1);\r
- } else vidCpyM2 = vidCpyM2_40col;\r
-\r
- vidCpyM2((unsigned char *)g_screen_ptr+320*8, PicoDraw2FB+328*8);\r
- vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
- gp2x_video_setpalette(localPal, 0x40);\r
-*/\r
PicoOpt = po_old;\r
currentConfig.EmuOpt = eo_old;\r
}\r
\r
void pemu_loop(void)\r
{\r
- static int gp2x_old_clock = -1, EmuOpt_old = 0;\r
+ static int gp2x_old_clock = -1, EmuOpt_old = 0, pal_old = 0;\r
+ static int gp2x_old_gamma = 100;\r
char fpsbuff[24]; // fps count c string\r
struct timeval tval; // timing\r
int pframes_done, pframes_shown, pthissec; // "period" frames, used for sync\r
printf("updated gamma to %i, A_SN's curve: %i\n", currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));\r
}\r
\r
- if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_PSYNC) {\r
+ if (((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_PSYNC) || Pico.m.pal != pal_old) {\r
if (currentConfig.EmuOpt & EOPT_PSYNC)\r
set_lcd_custom_rate(Pico.m.pal);\r
else\r
gp2x_make_fb_bufferable(currentConfig.EmuOpt & EOPT_MMUHACK);\r
\r
EmuOpt_old = currentConfig.EmuOpt;\r
+ pal_old = Pico.m.pal;\r
fpsbuff[0] = 0;\r
\r
// make sure we are in correct mode\r
if (PicoAHW & PAHW_MCD) PicoCDBufferInit();\r
\r
// calc vsync offset to sync timing code with vsync\r
- if (currentConfig.EmuOpt&0x2000) {\r
+ if (currentConfig.EmuOpt & EOPT_PSYNC) {\r
gettimeofday(&tval, 0);\r
gp2x_video_wait_vsync();\r
gettimeofday(&tval, 0);\r
{\r
int scalex = 320;\r
osd_fps_x = OSD_FPS_X;\r
- if (modes & 4) {\r
- vidCpyM2 = vidCpyM2_40col;\r
- } else {\r
- if (PicoOpt & 0x100) {\r
- vidCpyM2 = vidCpyM2_32col_nobord;\r
- scalex = 256;\r
- osd_fps_x = OSD_FPS_X - 64;\r
- } else {\r
- vidCpyM2 = vidCpyM2_32col;\r
- }\r
+ if (!(modes & 4) && (PicoOpt & POPT_DIS_32C_BORDER)) {\r
+ scalex = 256;\r
+ osd_fps_x = OSD_FPS_X - 64;\r
}\r
/* want vertical scaling and game is not in 240 line mode */\r
if (currentConfig.scaling == EOPT_SCALE_HW_HV && !(modes&8))\r
SRam.changed = 0;\r
}\r
\r
- // if in 8bit mode, generate 16bit image for menu background\r
- if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP))\r
- pemu_forced_frame(POPT_EN_SOFTSCALE);\r
+ // do menu background to be sure it's right\r
+ pemu_forced_frame(POPT_EN_SOFTSCALE);\r
}\r
\r
const char *plat_get_credits(void)\r
notaz.gp2x.de / libpicofe.git / blobdiff