sms wip: random tweaks, refactoring (palette, sound stuff, etc)

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@764 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/common/arm_utils.h b/common/arm_utils.h
index ae5ae24..8cf34ce 100644 (file)
--- a/common/arm_utils.h
+++ b/common/arm_utils.h
@@ -3,9 +3,9 @@
 \r
 // For commercial use, separate licencing terms must be obtained.\r
 \r
-void vidConvCpyRGB32  (void *to, void *from, int pixels);\r
-void vidConvCpyRGB32sh(void *to, void *from, int pixels);\r
-void vidConvCpyRGB32hi(void *to, void *from, int pixels);\r
+void bgr444_to_rgb32(void *to, void *from);\r
+void bgr444_to_rgb32_sh(void *to, void *from);\r
+\r
 void vidcpy_m2(void *dest, void *src, int m32col, int with_32c_border);\r
 void vidcpy_m2_rot(void *dest, void *src, int m32col, int with_32c_border);\r
 void spend_cycles(int c); // utility\r

diff --git a/common/arm_utils.s b/common/arm_utils.s
index b93b99f..fd13cac 100644 (file)
--- a/common/arm_utils.s
+++ b/common/arm_utils.s
@@ -13,7 +13,6 @@
 @ to      00000000 rrr00000 ggg00000 bbb00000 ...\r
 \r
 @ lr =  0x00e000e0, out: r3=lower_pix, r2=higher_pix; trashes rin\r
-@ if sh==2, r8=0x00404040 (sh!=0 destroys flags!)\r
 .macro convRGB32_2 rin sh=0\r
     and     r2,  lr, \rin, lsr #4 @ blue\r
     and     r3,  \rin, lr\r
@@ -59,16 +58,19 @@
 .endif\r
 \r
     orr     r2,  r2,   r2,  lsr #3\r
+.if \sh == 1\r
+    str     r2, [r0, #0x40*2*4]\r
+.endif\r
     str     r2, [r0], #4\r
 .endm\r
 \r
 \r
-.global vidConvCpyRGB32 @ void *to, void *from, int pixels\r
+.global bgr444_to_rgb32 @ void *to, void *from\r
 \r
-vidConvCpyRGB32:\r
+bgr444_to_rgb32:\r
     stmfd   sp!, {r4-r7,lr}\r
 \r
-    mov     r12, r2, lsr #3 @ repeats\r
+    mov     r12, #0x40>>3 @ repeats\r
     mov     lr, #0x00e00000\r
     orr     lr, lr, #0x00e0\r
 \r
@@ -80,19 +82,18 @@ vidConvCpyRGB32:
     convRGB32_2 r5\r
     convRGB32_2 r6\r
     convRGB32_2 r7\r
-\r
     bgt     .loopRGB32\r
 \r
-    ldmfd   sp!, {r4-r7,lr}\r
-    bx      lr\r
+    ldmfd   sp!, {r4-r7,pc}\r
 \r
 \r
-.global vidConvCpyRGB32sh @ void *to, void *from, int pixels\r
+.global bgr444_to_rgb32_sh @ void *to, void *from\r
 \r
-vidConvCpyRGB32sh:\r
+bgr444_to_rgb32_sh:\r
     stmfd   sp!, {r4-r7,lr}\r
 \r
-    mov     r12, r2, lsr #3 @ repeats\r
+    mov     r12, #0x40>>3 @ repeats\r
+    add     r0, r0, #0x40*4\r
     mov     lr, #0x00e00000\r
     orr     lr, lr, #0x00e0\r
 \r
@@ -104,21 +105,10 @@ vidConvCpyRGB32sh:
     convRGB32_2 r5, 1\r
     convRGB32_2 r6, 1\r
     convRGB32_2 r7, 1\r
-\r
     bgt     .loopRGB32sh\r
 \r
-    ldmfd   sp!, {r4-r7,lr}\r
-    bx      lr\r
-\r
-\r
-.global vidConvCpyRGB32hi @ void *to, void *from, int pixels\r
-\r
-vidConvCpyRGB32hi:\r
-    stmfd   sp!, {r4-r7,lr}\r
-\r
-    mov     r12, r2, lsr #3 @ repeats\r
-    mov     lr, #0x00e00000\r
-    orr     lr, lr, #0x00e0\r
+    mov     r12, #0x40>>3 @ repeats\r
+    sub     r1, r1, #0x40*2\r
 \r
 .loopRGB32hi:\r
      ldmia    r1!, {r4-r7}\r

diff --git a/common/emu.c b/common/emu.c
index aca54be..4a95a3f 100644 (file)
--- a/common/emu.c
+++ b/common/emu.c
@@ -1332,7 +1332,7 @@ void emu_loop(void)
 {\r
        int pframes_done;               /* "period" frames, used for sync */\r
        int frames_done, frames_shown;  /* actual frames for fps counter */\r
-       int oldmodes, target_fps, target_frametime;\r
+       int target_fps, target_frametime;\r
        unsigned int timestamp_base = 0, timestamp_fps;\r
        char *notice_msg = NULL;\r
        char fpsbuff[24];\r
@@ -1341,8 +1341,8 @@ void emu_loop(void)
        fpsbuff[0] = 0;\r
 \r
        /* make sure we are in correct mode */\r
-       oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;\r
        Pico.m.dirtyPal = 1;\r
+       rendstatus_old = -1;\r
 \r
        /* number of ticks per frame */\r
        if (Pico.m.pal) {\r
@@ -1371,7 +1371,6 @@ void emu_loop(void)
        {\r
                unsigned int timestamp;\r
                int diff, diff_lim;\r
-               int modes;\r
 \r
                timestamp = get_ticks();\r
                if (reset_timing) {\r
@@ -1398,13 +1397,6 @@ void emu_loop(void)
                        }\r
                }\r
 \r
-               // check for mode changes\r
-               modes = ((Pico.video.reg[12]&1)<<2) | (Pico.video.reg[1]&8);\r
-               if (modes != oldmodes) {\r
-                       oldmodes = modes;\r
-                       pemu_video_mode_change(!(modes & 4), (modes & 8));\r
-               }\r
-\r
                // second changed?\r
                if (timestamp - timestamp_fps >= ms_to_ticks(1000))\r
                {\r

diff --git a/common/plat.h b/common/plat.h
index a453431..ca847c6 100644 (file)
--- a/common/plat.h
+++ b/common/plat.h
@@ -9,7 +9,6 @@ void pemu_prep_defconfig(void);
 void pemu_loop_prep(void);
 void pemu_loop_end(void);
 void pemu_forced_frame(int opts);
-void pemu_video_mode_change(int is_32col, int is_240_lines);
 void pemu_update_display(const char *fps, const char *notice_msg);
 
 void pemu_sound_start(void);

diff --git a/gp2x/emu.c b/gp2x/emu.c
index dd4b686..77e33f2 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -36,7 +36,7 @@ extern int crashed_940;
 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;\r
+static int osd_fps_x, osd_y;\r
 \r
 extern void *gp2x_screens[4];\r
 \r
@@ -265,21 +265,66 @@ static int EmuScanEnd8_rot(unsigned int num)
        return 0;\r
 }\r
 \r
-int localPal[0x100];\r
-static void (*vidcpyM2)(void *dest, void *src, int m32col, int with_32c_border) = NULL;\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
+static int make_local_pal_md(int fast_mode)\r
+{\r
+       int pallen = 0xc0;\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
+       }\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
+       }\r
+       else\r
+               memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess\r
+\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
+       }\r
+\r
+       return 0x40;\r
+}\r
 \r
 void pemu_update_display(const char *fps, const char *notice)\r
 {\r
        int emu_opt = currentConfig.EmuOpt;\r
+       int ret;\r
 \r
        if (PicoOpt & POPT_ALT_RENDERER)\r
        {\r
                // 8bit fast renderer\r
                if (Pico.m.dirtyPal) {\r
                        Pico.m.dirtyPal = 0;\r
-                       vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
+                       ret = make_local_pal(1);\r
                        // feed new palette to our device\r
-                       gp2x_video_setpalette(localPal, 0x40);\r
+                       gp2x_video_setpalette(localPal, ret);\r
                }\r
                // a hack for VR\r
                if (PicoRead16Hook == PicoSVPRead16)\r
@@ -293,43 +338,17 @@ void pemu_update_display(const char *fps, const char *notice)
                // 8bit accurate renderer\r
                if (Pico.m.dirtyPal)\r
                {\r
-                       int pallen = 0xc0;\r
                        Pico.m.dirtyPal = 0;\r
-                       if (Pico.video.reg[0xC]&8) // shadow/hilight mode\r
-                       {\r
-                               vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
-                               vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);\r
-                               vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40);\r
-                               memcpy32(localPal+0xc0, localPal+0x40, 0x40);\r
-                               pallen = 0x100;\r
-                       }\r
-                       else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
-                               vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
-                               vidConvCpyRGB32(localPal+0x40, HighPal, 0x40);\r
-                               vidConvCpyRGB32(localPal+0x80, HighPal+0x40, 0x40);\r
-                       }\r
-                       else {\r
-                               vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
-                               memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess\r
-                       }\r
-                       if (pallen > 0xc0) {\r
-                               localPal[0xc0] = 0x0000c000;\r
-                               localPal[0xd0] = 0x00c00000;\r
-                               localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
-                               localPal[0xf0] = 0x00ffffff;\r
-                       }\r
-                       gp2x_video_setpalette(localPal, pallen);\r
+                       ret = make_local_pal(0);\r
+                       gp2x_video_setpalette(localPal, ret);\r
                }\r
        }\r
 \r
        if (notice || (emu_opt & 2)) {\r
-               int h = 232;\r
-               if (currentConfig.scaling == EOPT_SCALE_HW_HV && !(Pico.video.reg[1]&8))\r
-                       h -= 8;\r
                if (notice)\r
-                       osd_text(4, h, notice);\r
+                       osd_text(4, osd_y, notice);\r
                if (emu_opt & 2)\r
-                       osd_text(osd_fps_x, h, fps);\r
+                       osd_text(osd_fps_x, osd_y, fps);\r
        }\r
        if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))\r
                draw_cd_leds();\r
@@ -474,6 +493,9 @@ static void vidResetMode(void)
        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
+\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 plat_video_toggle_renderer(int is_next, int is_menu)\r
@@ -498,6 +520,7 @@ void plat_video_toggle_renderer(int is_next, int is_menu)
                return;\r
 \r
        vidResetMode();\r
+       rendstatus_old = -1;\r
 \r
        if (PicoOpt & POPT_ALT_RENDERER) {\r
                emu_status_msg(" 8bit fast renderer");\r
@@ -694,18 +717,21 @@ void plat_debug_cat(char *str)
 {\r
 }\r
 \r
-void pemu_video_mode_change(int is_32col, int is_240_lines)\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
-       if (is_32col && (PicoOpt & POPT_DIS_32C_BORDER)) {\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 && !is_240_lines)\r
-               gp2x_video_RGB_setscaling(8, scalex, 224);\r
-       else\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
@@ -819,6 +845,7 @@ void pemu_loop_end(void)
        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

diff --git a/linux/blit.c b/linux/blit.c
index 7f46623..fbaac03 100644 (file)
--- a/linux/blit.c
+++ b/linux/blit.c
@@ -3,37 +3,36 @@
 // to      00000000 rrr00000 ggg00000 bbb00000 ...
 // TODO: rm when gp2x/emu.c is no longer used
 
-void vidConvCpyRGB32  (void *to, void *from, int pixels)
+void bgr444_to_rgb32(void *to, void *from)
 {
        unsigned short *ps = from;
        unsigned int   *pd = to;
+       int pixels;
 
-       for (; pixels; pixels--, ps++, pd++)
+       for (pixels = 0x40; pixels; pixels--, ps++, pd++)
        {
                *pd = ((*ps<<20)&0xe00000) | ((*ps<<8)&0xe000) | ((*ps>>4)&0xe0);
                *pd |= *pd >> 3;
        }
 }
 
-void vidConvCpyRGB32sh(void *to, void *from, int pixels)
+void bgr444_to_rgb32_sh(void *to, void *from)
 {
        unsigned short *ps = from;
        unsigned int   *pd = to;
+       int pixels;
 
-       for (; pixels; pixels--, ps++, pd++)
+       pd += 0x40;
+       for (pixels = 0x40; pixels; pixels--, ps++, pd++)
        {
                *pd = ((*ps<<20)&0xe00000) | ((*ps<<8)&0xe000) | ((*ps>>4)&0xe0);
                *pd >>= 1;
                *pd |= *pd >> 3;
+               pd[0x40*2] = *pd;
        }
-}
-
-void vidConvCpyRGB32hi(void *to, void *from, int pixels)
-{
-       unsigned short *ps = from;
-       unsigned int   *pd = to;
 
-       for (; pixels; pixels--, ps++, pd++)
+       ps -= 0x40;
+       for (pixels = 0x40; pixels; pixels--, ps++, pd++)
        {
                *pd = ((*ps<<20)&0xe00000) | ((*ps<<8)&0xe000) | ((*ps>>4)&0xe0);
                continue;