/*\r
* (c) Copyright 2006-2010 notaz, All rights reserved.\r
+ * (c) Copyright 2019-2024 irixxxx\r
*\r
* For performance reasons 3 renderers are exported for both MD and 32x modes:\r
* - 16bpp line renderer\r
* - 8bpp tile renderer\r
* In 32x mode:\r
* - 32x layer is overlayed on top of 16bpp one\r
- * - line internal one done on PicoDraw2FB, then mixed with 32x\r
- * - tile internal one done on PicoDraw2FB, then mixed with 32x\r
+ * - line internal one done on .Draw2FB, then mixed with 32x\r
+ * - tile internal one done on .Draw2FB, then mixed with 32x\r
*/\r
\r
#include <stdio.h>\r
#include <pico/pico_int.h>\r
#include <pico/patch.h>\r
#include <pico/sound/mix.h>\r
-#include <zlib/zlib.h>\r
+#include <zlib.h>\r
\r
#ifdef BENCHMARK\r
#define OSD_FPS_X 220\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
+static int is_1stblanked;\r
+static int firstline, linecount;\r
+static int firstcol, colcount;\r
+\r
static int (*emu_scan_begin)(unsigned int num) = NULL;\r
static int (*emu_scan_end)(unsigned int num) = NULL;\r
\r
gp2x_soc_t soc;\r
\r
defaultConfig.CPUclock = default_cpu_clock;\r
- defaultConfig.renderer32x = RT_8BIT_FAST;\r
+ defaultConfig.renderer32x = RT_8BIT_ACC;\r
defaultConfig.analog_deadzone = 50;\r
\r
soc = soc_detect();\r
void pemu_validate_config(void)\r
{\r
if (gp2x_dev_id != GP2X_DEV_GP2X)\r
- PicoOpt &= ~POPT_EXT_FM;\r
+ PicoIn.opt &= ~POPT_EXT_FM;\r
if (gp2x_dev_id != GP2X_DEV_WIZ)\r
currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX;\r
\r
\r
static int get_renderer(void)\r
{\r
- if (PicoAHW & PAHW_32X)\r
+ if (doing_bg_frame)\r
+ return RT_16BIT;\r
+ if (PicoIn.AHW & PAHW_32X)\r
return currentConfig.renderer32x;\r
else\r
return currentConfig.renderer;\r
static void change_renderer(int diff)\r
{\r
int *r;\r
- if (PicoAHW & PAHW_32X)\r
+ if (PicoIn.AHW & PAHW_32X)\r
r = ¤tConfig.renderer32x;\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
}\r
\r
#define is_16bit_mode() \\r
- (get_renderer() == RT_16BIT || (PicoAHW & PAHW_32X))\r
+ (currentConfig.renderer == RT_16BIT || (PicoIn.AHW & PAHW_32X) || doing_bg_frame)\r
\r
static void (*osd_text)(int x, int y, const char *text);\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
\r
static void draw_pico_ptr(void)\r
{\r
- unsigned short *p = (unsigned short *)g_screen_ptr;\r
- int x, y, pitch = 320;\r
+ int up = (PicoPicohw.pen_pos[0]|PicoPicohw.pen_pos[1]) & 0x8000;\r
+ int x, y, pitch = 320, offs;\r
+ // storyware pages are actually squished, 2:1\r
+ int h = (pico_inp_mode == 1 ? 160 : linecount);\r
+ if (h < 224) y++;\r
\r
- // only if pen enabled and for 16bit modes\r
- if (pico_inp_mode == 0 || currentConfig.EmuOpt != RT_16BIT)\r
- return;\r
-\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
+ x = ((pico_pen_x * colcount * ((1ULL<<32)/320 + 1)) >> 32) + firstcol;\r
+ y = ((pico_pen_y * h * ((1ULL<<32)/224 + 1)) >> 32) + firstline;\r
\r
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
pitch = 240;\r
- p += (319 - x) * pitch + y;\r
+ offs = (319 - x) * pitch + y;\r
} else\r
- p += x + y * pitch;\r
+ offs = x + y * pitch;\r
+\r
+ if (is_16bit_mode()) {\r
+ unsigned short *p = (unsigned short *)g_screen_ptr + offs;\r
+ int o = (up ? 0x0000 : 0xffff), _ = (up ? 0xffff : 0x0000);\r
+\r
+ p[-pitch-1] ^= o; p[-pitch] ^= _; p[-pitch+1] ^= _; p[-pitch+2] ^= o;\r
+ p[-1] ^= _; p[0] ^= o; p[1] ^= o; p[2] ^= _;\r
+ p[pitch-1] ^= _; p[pitch] ^= o; p[pitch+1] ^= o; p[pitch+2] ^= _;\r
+ p[2*pitch-1]^= o; p[2*pitch]^= _; p[2*pitch+1]^= _; p[2*pitch+2]^= o;\r
+ } else {\r
+ unsigned char *p = (unsigned char *)g_screen_ptr + offs;\r
+ int o = (up ? 0xe0 : 0xf0), _ = (up ? 0xf0 : 0xe0);\r
+\r
+ p[-pitch-1] = o; p[-pitch] = _; p[-pitch+1] = _; p[-pitch+2] = o;\r
+ p[-1] = _; p[0] = o; p[1] = o; p[2] = _;\r
+ p[pitch-1] = _; p[pitch] = o; p[pitch+1] = o; p[pitch+2] = _;\r
+ p[2*pitch-1]= o; p[2*pitch]= _; p[2*pitch+1]= _; p[2*pitch+2]= o;\r
+ }\r
+}\r
+\r
+static void clear_1st_column(int firstcol, int firstline, int linecount)\r
+{\r
+ int size = is_16bit_mode() ? 2 : 1;\r
+ int black = is_16bit_mode() ? 0 : 0xe0;\r
+ int i;\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
+ // SMS 1st column blanked, replace with black\r
+ if ((currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) && !doing_bg_frame) {\r
+ int pitch = 240*size;\r
+ char *p = (char *)g_screen_ptr + (319-(firstcol-8))*pitch;\r
+ for (i = 0; i < 8; i++, p -= pitch)\r
+ memset(p+(firstline)*size, black, linecount*size);\r
+ } else {\r
+ int pitch = 320*size;\r
+ char *p = (char *)g_screen_ptr + (firstline)*pitch;\r
+ for (i = 0; i < linecount; i++, p += pitch)\r
+ memset(p+(firstcol-8)*size, black, 8*size);\r
+ }\r
}\r
\r
/* rot thing for Wiz */\r
\r
static int EmuScanBegin16_rot(unsigned int num)\r
{\r
- DrawLineDest = rot_buff + (num & 3) * 320 * 2;\r
+ Pico.est.DrawLineDest = rot_buff + (num & 3) * 320 * 2;\r
return 0;\r
}\r
\r
if ((num & 3) != 3)\r
return 0;\r
rotated_blit16(g_screen_ptr, rot_buff, num + 1,\r
- !(Pico.video.reg[12] & 1) && !(PicoOpt & POPT_EN_SOFTSCALE));\r
+ !(Pico.video.reg[12] & 1) && !(PicoIn.opt & 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
+ Pico.est.DrawLineDest = rot_buff + (num & 3) * 320;\r
return 0;\r
}\r
\r
if ((num & 3) != 3)\r
return 0;\r
rotated_blit8(g_screen_ptr, rot_buff, num + 1,\r
- !(Pico.video.reg[12] & 1));\r
+ !(Pico.video.reg[12] & 1) && !(PicoIn.opt & POPT_EN_SOFTSCALE));\r
return 0;\r
}\r
\r
/* line doublers */\r
static unsigned int ld_counter;\r
-static int ld_left, ld_lines;\r
+static int ld_left, ld_lines; // numbers in Q1 format\r
\r
static int EmuScanBegin16_ld(unsigned int num)\r
{\r
- if ((signed int)(ld_counter - num) > 100)\r
- ld_counter = 0;\r
+ if ((signed int)(ld_counter - num) > 100) {\r
+ // vsync, offset so that the upscaled image is centered\r
+ ld_counter = 120 - (120-num) * (ld_lines+2)/ld_lines;\r
+ ld_left = ld_lines;\r
+ }\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
+ Pico.est.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
+ void *oldline = Pico.est.DrawLineDest;\r
\r
if (emu_scan_end)\r
emu_scan_end(ld_counter);\r
\r
ld_counter++;\r
- ld_left--;\r
+ ld_left -= 2;\r
if (ld_left <= 0) {\r
- ld_left = ld_lines;\r
+ ld_left += ld_lines;\r
\r
EmuScanBegin16_ld(num);\r
- memcpy32(DrawLineDest, oldline, 320 * gp2x_current_bpp / 8 / 4);\r
+ memcpy(Pico.est.DrawLineDest, oldline, 320 * gp2x_current_bpp / 8);\r
if (emu_scan_end)\r
emu_scan_end(ld_counter);\r
\r
}\r
\r
static int localPal[0x100];\r
-static void (*vidcpyM2)(void *dest, void *src, int m32col, int with_32c_border);\r
+static int localPalSize;\r
+\r
+static void (*vidcpy8bit)(void *dest, void *src, int x_y, int w_h);\r
static int (*make_local_pal)(int fast_mode);\r
\r
static int make_local_pal_md(int fast_mode)\r
{\r
- int pallen = 0xc0;\r
+ int pallen = 0x100;\r
\r
- bgr444_to_rgb32(localPal, Pico.cram);\r
- if (fast_mode)\r
- return 0x40;\r
-\r
- if (Pico.video.reg[0xC] & 8) { // shadow/hilight mode\r
- bgr444_to_rgb32_sh(localPal, Pico.cram);\r
- localPal[0xc0] = 0x0000c000;\r
- localPal[0xd0] = 0x00c00000;\r
- localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
- localPal[0xf0] = 0x00ffffff;\r
- pallen = 0x100;\r
+ if (fast_mode) {\r
+ bgr444_to_rgb32(localPal, PicoMem.cram, 64);\r
+ pallen = 0x40;\r
+ Pico.m.dirtyPal = 0;\r
}\r
- else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
- bgr444_to_rgb32(localPal+0x40, HighPal);\r
- bgr444_to_rgb32(localPal+0x80, HighPal+0x40);\r
+ else if (Pico.est.rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
+ switch (Pico.est.SonicPalCount) {\r
+ case 3: bgr444_to_rgb32(localPal+0xc0, Pico.est.SonicPal+0xc0, 64);\r
+ case 2: bgr444_to_rgb32(localPal+0x80, Pico.est.SonicPal+0x80, 64);\r
+ case 1: bgr444_to_rgb32(localPal+0x40, Pico.est.SonicPal+0x40, 64);\r
+ default:bgr444_to_rgb32(localPal, Pico.est.SonicPal, 64);\r
+ }\r
+ pallen = (Pico.est.SonicPalCount+1)*0x40;\r
}\r
- else\r
- memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess\r
+ else if (Pico.video.reg[0xC] & 8) { // shadow/hilight mode\r
+ bgr444_to_rgb32(localPal, Pico.est.SonicPal, 64);\r
+ bgr444_to_rgb32_sh(localPal, Pico.est.SonicPal);\r
+ memcpy(localPal+0xc0, localPal, 0x40*4); // for spr prio mess\r
+ }\r
+ else {\r
+ bgr444_to_rgb32(localPal, Pico.est.SonicPal, 64);\r
+ memcpy(localPal+0x40, localPal, 0x40*4); // for spr prio mess\r
+ memcpy(localPal+0x80, localPal, 0x80*4); // for spr prio mess\r
+ }\r
+ localPal[0xc0] = 0x0000c000;\r
+ localPal[0xd0] = 0x00c00000;\r
+ localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
+ localPal[0xf0] = 0x00ffffff;\r
\r
+ if (Pico.m.dirtyPal == 2)\r
+ Pico.m.dirtyPal = 0;\r
return pallen;\r
}\r
\r
static int make_local_pal_sms(int fast_mode)\r
{\r
- unsigned short *spal = Pico.cram;\r
- unsigned int *dpal = (void *)localPal;\r
- unsigned int i, t;\r
-\r
- for (i = 0x40; i > 0; i--) {\r
- t = *spal++;\r
- t = ((t & 0x0003) << 22) | ((t & 0x000c) << 12) | ((t & 0x0030) << 2);\r
- t |= t >> 2;\r
- t |= t >> 4;\r
- *dpal++ = t;\r
+ static u16 tmspal[32] = {\r
+ // SMS palette for TMS modes\r
+ 0x0000, 0x0000, 0x00a0, 0x00f0, 0x0500, 0x0f00, 0x0005, 0x0ff0,\r
+ 0x000a, 0x000f, 0x0055, 0x00ff, 0x0050, 0x0f0f, 0x0555, 0x0fff,\r
+ // TMS palette\r
+ 0x0000, 0x0000, 0x04c2, 0x07d6, 0x0e55, 0x0f77, 0x055c, 0x0ee4,\r
+ 0x055f, 0x077f, 0x05bc, 0x08ce, 0x03a2, 0x0b5c, 0x0ccc, 0x0fff,\r
+ };\r
+ int i;\r
+ \r
+ if (!(Pico.video.reg[0] & 0x4)) {\r
+ for (i = Pico.est.SonicPalCount; i >= 0; i--) {\r
+ int sg = !!(PicoIn.AHW & (PAHW_SG|PAHW_SC));\r
+ bgr444_to_rgb32(localPal+i*0x40, tmspal+sg*0x10, 32);\r
+ memcpy(localPal+i*0x40+0x20, localPal+i*0x40, 0x20*4);\r
+ }\r
+ } else if (fast_mode) {\r
+ for (i = 0;i >= 0; i--) {\r
+ bgr444_to_rgb32(localPal+i*0x40, PicoMem.cram+i*0x40, 32);\r
+ memcpy(localPal+i*0x40+0x20, localPal+i*0x40, 0x20*4);\r
+ }\r
+ } else {\r
+ for (i = Pico.est.SonicPalCount; i >= 0; i--) {\r
+ bgr444_to_rgb32(localPal+i*0x40, Pico.est.SonicPal+i*0x40, 32);\r
+ memcpy(localPal+i*0x40+0x20, localPal+i*0x40, 0x20*4);\r
+ }\r
}\r
-\r
- return 0x40;\r
+ if (Pico.m.dirtyPal == 2)\r
+ Pico.m.dirtyPal = 0;\r
+ return (Pico.est.SonicPalCount+1)*0x40;\r
}\r
\r
void pemu_finalize_frame(const char *fps, const char *notice)\r
{\r
int emu_opt = currentConfig.EmuOpt;\r
- int ret;\r
+ int direct_rendered = 1;\r
\r
- if (PicoAHW & PAHW_32X)\r
- ; // nothing to do\r
+ if (is_16bit_mode())\r
+ localPalSize = 0; // nothing to do\r
else if (get_renderer() == RT_8BIT_FAST)\r
{\r
// 8bit fast renderer\r
- if (Pico.m.dirtyPal) {\r
- Pico.m.dirtyPal = 0;\r
- ret = make_local_pal(1);\r
- // feed new palette to our device\r
- gp2x_video_setpalette(localPal, ret);\r
- }\r
+ if (Pico.m.dirtyPal)\r
+ localPalSize = make_local_pal(1);\r
// a hack for VR\r
- if (PicoAHW & PAHW_SVP)\r
- memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);\r
+ if (PicoIn.AHW & PAHW_SVP)\r
+ memset32((int *)(Pico.est.Draw2FB+328*8+328*223), 0xe0e0e0e0, 328/4);\r
// do actual copy\r
- vidcpyM2(g_screen_ptr, PicoDraw2FB+328*8,\r
- !(Pico.video.reg[12] & 1), !(PicoOpt & POPT_DIS_32C_BORDER));\r
+ vidcpy8bit(g_screen_ptr, Pico.est.Draw2FB,\r
+ (firstcol << 16) | firstline, (colcount << 16) | linecount);\r
+ direct_rendered = 0;\r
}\r
else if (get_renderer() == RT_8BIT_ACC)\r
{\r
// 8bit accurate renderer\r
if (Pico.m.dirtyPal)\r
- {\r
- Pico.m.dirtyPal = 0;\r
- ret = make_local_pal(0);\r
- gp2x_video_setpalette(localPal, ret);\r
- }\r
+ localPalSize = make_local_pal(0);\r
}\r
\r
+ // blank 1st column, only needed in modes directly rendering to screen\r
+ if (is_1stblanked && direct_rendered)\r
+ clear_1st_column(firstcol, firstline, linecount);\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
+ if ((PicoIn.AHW & PAHW_MCD) && (emu_opt & EOPT_EN_CD_LEDS))\r
draw_cd_leds();\r
- if (PicoAHW & PAHW_PICO)\r
- draw_pico_ptr();\r
+ if (PicoIn.AHW & PAHW_PICO) {\r
+ int h = linecount, w = colcount;\r
+ u16 *pd = g_screen_ptr + firstline*g_screen_ppitch + firstcol;\r
+\r
+ if (pico_inp_mode && is_16bit_mode())\r
+ emu_pico_overlay(pd, w, h, g_screen_ppitch);\r
+ if (pico_inp_mode /*== 2 || overlay*/)\r
+ draw_pico_ptr();\r
+ }\r
}\r
\r
void plat_video_flip(void)\r
{\r
int stride = g_screen_width;\r
gp2x_video_flip();\r
+ // switching the palette takes immediate effect, whilst flipping only\r
+ // takes effect with the next vsync; unavoidable flicker may occur!\r
+ if (localPalSize)\r
+ gp2x_video_setpalette(localPal, localPalSize);\r
\r
if (is_16bit_mode())\r
stride *= 2;\r
- PicoDrawSetOutBuf(g_screen_ptr, stride);\r
+ // the fast renderer has overlap areas and can't directly render to\r
+ // screen buffers. Its output is copied to screen in finalize_frame\r
+ if (get_renderer() != RT_8BIT_FAST || (PicoIn.AHW & PAHW_32X))\r
+ PicoDrawSetOutBuf(g_screen_ptr, stride);\r
}\r
\r
/* XXX */\r
-#ifdef __GP2X__\r
unsigned int plat_get_ticks_ms(void)\r
{\r
return gp2x_get_ticks_ms();\r
{\r
return gp2x_get_ticks_us();\r
}\r
-#endif\r
\r
void plat_wait_till_us(unsigned int us_to)\r
{\r
\r
void plat_status_msg_clear(void)\r
{\r
- int is_8bit = !is_16bit_mode();\r
- if (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
+ int i, is_8bit = !is_16bit_mode();\r
+\r
+ for (i = 0; i < 4; i++) {\r
+ if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+ /* ugh.. */\r
+ int u, *p;\r
+ if (is_8bit) {\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
+ } else {\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
+ } else {\r
+ if (is_8bit) {\r
+ char *d = (char *)gp2x_screens[i] + 320 * (240-8);\r
+ memset32((int *)d, 0xe0e0e0e0, 320 * 8 / 4);\r
+ } else {\r
+ char *d = (char *)gp2x_screens[i] + 320*2 * (240-8);\r
+ memset32((int *)d, 0, 2*320 * 8 / 4);\r
+ }\r
}\r
- return;\r
}\r
-\r
- if (is_8bit)\r
- gp2x_memset_all_buffers(320*232, 0xe0, 320*8);\r
- else\r
- gp2x_memset_all_buffers(320*232*2, 0, 320*8*2);\r
}\r
\r
void plat_status_msg_busy_next(const char *msg)\r
\r
void plat_status_msg_busy_first(const char *msg)\r
{\r
- gp2x_memcpy_all_buffers(g_screen_ptr, 0, 320*240*2);\r
plat_status_msg_busy_next(msg);\r
}\r
\r
int gp2x_mode = 16;\r
int renderer = get_renderer();\r
\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
- emu_scan_begin = NULL;\r
- emu_scan_end = NULL;\r
+ PicoIn.opt &= ~(POPT_ALT_RENDERER|POPT_DIS_32C_BORDER|POPT_EN_SOFTSCALE);\r
+ if (currentConfig.scaling == EOPT_SCALE_SW) {\r
+ PicoIn.opt |= POPT_EN_SOFTSCALE;\r
+ PicoIn.filter = EOPT_FILTER_BILINEAR2;\r
+ } else if (currentConfig.scaling == EOPT_SCALE_HW)\r
+ // hw scaling, render without any padding\r
+ PicoIn.opt |= POPT_DIS_32C_BORDER;\r
\r
switch (renderer) {\r
case RT_16BIT:\r
gp2x_mode = 8;\r
break;\r
case RT_8BIT_FAST:\r
- PicoOpt |= POPT_ALT_RENDERER;\r
+ PicoIn.opt |= POPT_ALT_RENDERER;\r
PicoDrawSetOutFormat(PDF_NONE, 0);\r
- vidcpyM2 = vidcpy_m2;\r
+ vidcpy8bit = vidcpy_8bit;\r
gp2x_mode = 8;\r
break;\r
default:\r
break;\r
}\r
\r
- if (PicoAHW & PAHW_32X) {\r
+ if (PicoIn.AHW & PAHW_32X) {\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
}\r
- else {\r
- PicoDrawSetOutFormat(PDF_NONE, 0);\r
- }\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
gp2x_mode = 16;\r
}\r
\r
+ emu_scan_begin = NULL;\r
+ emu_scan_end = NULL;\r
+\r
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
- if ((PicoAHW & PAHW_32X) || renderer == RT_16BIT) {\r
+ if ((PicoIn.AHW & PAHW_32X) || renderer == RT_16BIT) {\r
emu_scan_begin = EmuScanBegin16_rot;\r
emu_scan_end = EmuScanEnd16_rot;\r
+ memset(rot_buff, 0, 320*4*2);\r
}\r
else if (renderer == RT_8BIT_ACC) {\r
emu_scan_begin = EmuScanBegin8_rot;\r
emu_scan_end = EmuScanEnd8_rot;\r
+ memset(rot_buff, 0xe0, 320*4);\r
}\r
else if (renderer == RT_8BIT_FAST)\r
- vidcpyM2 = vidcpy_m2_rot;\r
+ vidcpy8bit = vidcpy_8bit_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
+ osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : emu_osd_text16;\r
else\r
osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;\r
\r
localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
localPal[0xf0] = 0x00ffffff;\r
gp2x_video_setpalette(localPal, 0x100);\r
- gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
}\r
- else\r
- gp2x_memset_all_buffers(0, 0, 320*240*2);\r
\r
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)\r
gp2x_mode = -gp2x_mode;\r
\r
- gp2x_video_changemode(gp2x_mode);\r
+ gp2x_video_changemode(gp2x_mode, Pico.m.pal);\r
\r
- Pico.m.dirtyPal = 1;\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
- PicoOpt &= ~POPT_EN_SOFTSCALE;\r
- if (currentConfig.scaling == EOPT_SCALE_SW)\r
- PicoOpt |= POPT_EN_SOFTSCALE;\r
+ Pico.m.dirtyPal = 1;\r
\r
// palette converters for 8bit modes\r
- make_local_pal = (PicoAHW & PAHW_SMS) ? make_local_pal_sms : make_local_pal_md;\r
+ make_local_pal = (PicoIn.AHW & 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
+void emu_video_mode_change(int start_line, int line_count, int start_col, int col_count)\r
{\r
int scalex = 320, scaley = 240;\r
int ln_offs = 0;\r
\r
+ if (currentConfig.vscaling != EOPT_SCALE_NONE &&\r
+ (is_16bit_mode() || get_renderer() != RT_8BIT_FAST)) {\r
+ /* NTSC always has 224 visible lines, anything smaller has bars */\r
+ if (line_count < 224 && line_count > 144) {\r
+ start_line -= (224-line_count) /2;\r
+ line_count = 224;\r
+ }\r
+\r
+ /* line doubling for swscaling, also needed for bg frames */\r
+ if (currentConfig.vscaling == EOPT_SCALE_SW && line_count < 240) {\r
+ ld_lines = ld_left = 2*line_count / (240 - line_count);\r
+ PicoDrawSetCallbacks(EmuScanBegin16_ld,EmuScanEnd16_ld);\r
+ }\r
+ }\r
+\r
+ /* blanking for SMS with 1st tile blanked */\r
+ is_1stblanked = (col_count == 248);\r
+ firstline = start_line; linecount = line_count;\r
+ firstcol = start_col; colcount = col_count;\r
+\r
if (doing_bg_frame)\r
return;\r
\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
+ if (col_count < 320 && currentConfig.scaling == EOPT_SCALE_HW) {\r
+ scalex = col_count;\r
+ osd_fps_x = col_count - (320-OSD_FPS_X);\r
}\r
\r
if (currentConfig.vscaling == EOPT_SCALE_HW) {\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
vid_reset_mode();\r
rendstatus_old = -1;\r
\r
- if (PicoAHW & PAHW_32X)\r
+ if (PicoIn.AHW & PAHW_32X)\r
emu_status_msg(renderer_names32x[get_renderer()]);\r
else\r
emu_status_msg(renderer_names[get_renderer()]);\r
if (ret > 35000)\r
{\r
if (pdown_frames++ > 5)\r
- PicoPad[0] |= 0x20;\r
+ PicoIn.pad[0] |= 0x20;\r
\r
pico_pen_x = px;\r
pico_pen_y = py;\r
gp2x_soc_t soc;\r
\r
soc = soc_detect();\r
- if ((PicoOpt & POPT_EN_STEREO) && soc == SOCID_MMSP2)\r
+ if ((PicoIn.opt & POPT_EN_STEREO) && soc == SOCID_MMSP2)\r
need_low_volume = 1;\r
\r
if (has_changed)\r
\r
/* set the right mixer func */\r
if (vol >= 5)\r
- PsndMix_32_to_16l = mix_32_to_16l_stereo;\r
+ PsndMix_32_to_16 = mix_32_to_16_stereo;\r
else {\r
- mix_32_to_16l_level = 5 - vol;\r
- PsndMix_32_to_16l = mix_32_to_16l_stereo_lvl;\r
+ mix_32_to_16_level = 5 - vol;\r
+ PsndMix_32_to_16 = mix_32_to_16_stereo_lvl;\r
}\r
}\r
\r
void pemu_sound_start(void)\r
{\r
- emu_sound_start();\r
-\r
- plat_target_step_volume(¤tConfig.volume, 0);\r
-\r
-#if 0\r
- static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;\r
+ gp2x_soc_t soc;\r
\r
- PsndOut = NULL;\r
+ emu_sound_start();\r
\r
- // prepare sound stuff\r
if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
{\r
- int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
- int snd_rate_oss = PsndRate;\r
- gp2x_soc_t soc;\r
-\r
- memset(sndBuffer, 0, sizeof(sndBuffer));\r
- PsndOut = sndBuffer;\r
- PicoWriteSound = oss_write_nonblocking;\r
- plat_update_volume(0, 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(snd_rate_oss, is_stereo, 1);\r
- sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
-\r
soc = soc_detect();\r
- if (soc == SOCID_POLLUX)\r
- PsndRate = pollux_get_real_snd_rate(PsndRate);\r
-\r
- #define SOUND_RERATE_FLAGS (POPT_EN_FM|POPT_EN_PSG|POPT_EN_STEREO|POPT_EXT_FM|POPT_EN_MCD_CDDA)\r
- if (PsndRate != PsndRate_old || Pico.m.pal != pal_old || ((PicoOpt & POPT_EXT_FM) && crashed_940) ||\r
- ((PicoOpt ^ PicoOpt_old) & SOUND_RERATE_FLAGS)) {\r
+ if (soc == SOCID_POLLUX) {\r
+ PicoIn.sndRate = pollux_get_real_snd_rate(PicoIn.sndRate);\r
PsndRerate(Pico.m.frame_count ? 1 : 0);\r
}\r
\r
- PsndRate_old = PsndRate;\r
- PicoOpt_old = PicoOpt;\r
- pal_old = Pico.m.pal;\r
+ plat_target_step_volume(¤tConfig.volume, 0);\r
}\r
-#endif\r
}\r
\r
-static const int sound_rates[] = { 44100, 32000, 22050, 16000, 11025, 8000 };\r
+static const int sound_rates[] = { 52000, 44100, 32000, 22050, 16000, 11025, 8000 };\r
\r
void pemu_sound_stop(void)\r
{\r
int i;\r
\r
/* get back from Pollux pain */\r
- PsndRate += 1000;\r
+ PicoIn.sndRate += 1000;\r
for (i = 0; i < ARRAY_SIZE(sound_rates); i++) {\r
- if (PsndRate >= sound_rates[i]) {\r
- PsndRate = sound_rates[i];\r
+ if (PicoIn.sndRate >= sound_rates[i]) {\r
+ PicoIn.sndRate = sound_rates[i];\r
break;\r
}\r
}\r
void pemu_forced_frame(int no_scale, int do_emu)\r
{\r
doing_bg_frame = 1;\r
- PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
PicoDrawSetCallbacks(NULL, NULL);\r
Pico.m.dirtyPal = 1;\r
+ PicoIn.opt &= ~POPT_DIS_32C_BORDER;\r
+ gp2x_current_bpp = 16;\r
+ // always render in screen 3 since menu uses 0-2\r
+ g_screen_ptr = gp2x_screens[3];\r
\r
- emu_cmn_forced_frame(no_scale, do_emu);\r
+ if (!no_scale)\r
+ no_scale = currentConfig.scaling == EOPT_SCALE_NONE;\r
+ emu_cmn_forced_frame(no_scale, do_emu, g_screen_ptr);\r
+\r
+ if (is_1stblanked)\r
+ clear_1st_column(firstcol, firstline, linecount);\r
\r
g_menubg_src_ptr = g_screen_ptr;\r
doing_bg_frame = 0;\r
// make sure we are in correct mode\r
change_renderer(0);\r
vid_reset_mode();\r
+ rendstatus_old = -1;\r
}\r
\r
void pemu_loop_prep(void)\r
{\r
pemu_sound_stop();\r
\r
+ if (g_screen_ptr == gp2x_screens[0]) {\r
+ /* currently on screen 3, which is needed for forced_frame */\r
+ int size = gp2x_current_bpp / 8;\r
+ gp2x_memcpy_all_buffers(g_screen_ptr, 0, 320*240 * size);\r
+ gp2x_video_flip();\r
+ }\r
/* do one more frame for menu bg */\r
pemu_forced_frame(0, 1);\r
}\r
notaz.gp2x.de / picodrive.git / blobdiff