32x: various gfx related bugfixes

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

diff --git a/pico/32x/draw.c b/pico/32x/draw.c
index 027b963..2c70221 100644 (file)
--- a/pico/32x/draw.c
+++ b/pico/32x/draw.c
@@ -50,19 +50,12 @@ static void convert_pal555(int invert_prio)
 {                                                                 \
   unsigned short t;                                               \
   int i;                                                          \
-  for (i = 320/2; i > 0; i--, p32x++) {                           \
-    t = pal[*p32x >> 8];                                          \
-    if (*pmd == mdbg || (t & 0x20))                               \
-      *pd = t;                                                    \
-    else                                                          \
-      pmd_draw_code;                                              \
-    pd++; pmd++;                                                  \
-    t = pal[*p32x & 0xff];                                        \
+  for (i = 320; i > 0; i--, pd++, p32x++, pmd++) {                \
+    t = pal[*(unsigned char *)((long)p32x ^ 1)];                  \
     if (*pmd == mdbg || (t & 0x20))                               \
       *pd = t;                                                    \
     else                                                          \
       pmd_draw_code;                                              \
-    pd++; pmd++;                                                  \
   }                                                               \
 } 
 
@@ -114,7 +107,10 @@ void FinalizeLine32xRGB555(int sh, int line)
     convert_pal555(Pico32x.vdp_regs[0] & P32XV_PRI);
 
   if ((Pico32x.vdp_regs[0] & P32XV_Mx) == 1) { // Packed Pixel Mode
-    do_line_pp(pd, p32x, pmd,);
+    unsigned char *p32xb = (void *)p32x;
+    if (Pico32x.vdp_regs[2 / 2] & P32XV_SFT)
+      p32xb++;
+    do_line_pp(pd, p32xb, pmd,);
   }
   else { // Run Length Mode
     do_line_rl(pd, p32x, pmd,);
@@ -125,22 +121,22 @@ void FinalizeLine32xRGB555(int sh, int line)
   *dst = palmd[*pmd]
 
 #define PICOSCAN_PRE \
-  PicoScan32xBegin(l + (lines_offs & 0xff)); \
+  PicoScan32xBegin(l + (lines_sft_offs & 0xff)); \
   dst = DrawLineDest; \
 
 #define PICOSCAN_POST \
-  PicoScan32xEnd(l + (lines_offs & 0xff)); \
+  PicoScan32xEnd(l + (lines_sft_offs & 0xff)); \
 
 #define make_do_loop(name, pre_code, post_code, md_code)        \
 /* Direct Color Mode */                                         \
 static void do_loop_dc##name(unsigned short *dst,               \
-    unsigned short *dram, int lines_offs, int mdbg)             \
+    unsigned short *dram, int lines_sft_offs, int mdbg)         \
 {                                                               \
   int inv_bit = (Pico32x.vdp_regs[0] & P32XV_PRI) ? 0x8000 : 0; \
   unsigned char  *pmd = PicoDraw2FB + 328 * 8 + 8;              \
   unsigned short *palmd = HighPal;                              \
   unsigned short *p32x;                                         \
-  int lines = lines_offs >> 16;                                 \
+  int lines = lines_sft_offs >> 16;                             \
   int l;                                                        \
   (void)palmd;                                                  \
   for (l = 0; l < lines; l++, pmd += 8) {                       \
@@ -153,18 +149,19 @@ static void do_loop_dc##name(unsigned short *dst,               \
                                                                 \
 /* Packed Pixel Mode */                                         \
 static void do_loop_pp##name(unsigned short *dst,               \
-    unsigned short *dram, int lines_offs, int mdbg)             \
+    unsigned short *dram, int lines_sft_offs, int mdbg)         \
 {                                                               \
   unsigned short *pal = Pico32xMem->pal_native;                 \
   unsigned char  *pmd = PicoDraw2FB + 328 * 8 + 8;              \
   unsigned short *palmd = HighPal;                              \
-  unsigned short *p32x;                                         \
-  int lines = lines_offs >> 16;                                 \
+  unsigned char  *p32x;                                         \
+  int lines = lines_sft_offs >> 16;                             \
   int l;                                                        \
   (void)palmd;                                                  \
   for (l = 0; l < lines; l++, pmd += 8) {                       \
     pre_code;                                                   \
-    p32x = dram + dram[l];                                      \
+    p32x = (void *)(dram + dram[l]);                            \
+    p32x += (lines_sft_offs >> 8) & 1;                          \
     do_line_pp(dst, p32x, pmd, md_code);                        \
     post_code;                                                  \
   }                                                             \
@@ -172,13 +169,13 @@ static void do_loop_pp##name(unsigned short *dst,               \
                                                                 \
 /* Run Length Mode */                                           \
 static void do_loop_rl##name(unsigned short *dst,               \
-    unsigned short *dram, int lines_offs, int mdbg)             \
+    unsigned short *dram, int lines_sft_offs, int mdbg)         \
 {                                                               \
   unsigned short *pal = Pico32xMem->pal_native;                 \
   unsigned char  *pmd = PicoDraw2FB + 328 * 8 + 8;              \
   unsigned short *palmd = HighPal;                              \
   unsigned short *p32x;                                         \
-  int lines = lines_offs >> 16;                                 \
+  int lines = lines_sft_offs >> 16;                             \
   int l;                                                        \
   (void)palmd;                                                  \
   for (l = 0; l < lines; l++, pmd += 8) {                       \
@@ -217,6 +214,7 @@ void PicoDraw32xLayer(int offs, int lines, int md_bg)
   int have_scan = PicoScan32xBegin != NULL && PicoScan32xEnd != NULL;
   const do_loop_func *do_loop;
   unsigned short *dram;
+  int lines_sft_offs;
   int which_func;
 
   DrawLineDest = DrawLineDestBase + offs * DrawLineDestIncrement;
@@ -253,8 +251,11 @@ do_it:
     which_func = have_scan ? DO_LOOP_MD_SCAN : DO_LOOP_MD;
   else
     which_func = have_scan ? DO_LOOP_SCAN : DO_LOOP;
+  lines_sft_offs = (lines << 16) | offs;
+  if (Pico32x.vdp_regs[2 / 2] & P32XV_SFT)
+    lines_sft_offs |= 1 << 8;
 
-  do_loop[which_func](DrawLineDest, dram, (lines << 16) | offs, md_bg);
+  do_loop[which_func](DrawLineDest, dram, lines_sft_offs, md_bg);
 }
 
 void PicoDraw32xSetFrameMode(int is_on, int only_32x)

diff --git a/pico/32x/draw_arm.s b/pico/32x/draw_arm.s
index 4cafd2a..94363f9 100644 (file)
--- a/pico/32x/draw_arm.s
+++ b/pico/32x/draw_arm.s
@@ -58,7 +58,7 @@ Pico32xNativePal:
 .endm
 
 @ direct color
-@ unsigned short *dst, unsigned short *dram, int lines_offs, int mdbg
+@ unsigned short *dst, unsigned short *dram, int lines_sft_offs, int mdbg
 .macro make_do_loop_dc name call_scan do_md
 .global \name
 \name:
@@ -144,7 +144,7 @@ Pico32xNativePal:
 .endif
 .endm
 
-@ unsigned short *dst, unsigned short *dram, int lines_offs, int mdbg
+@ unsigned short *dst, unsigned short *dram, int lines_sft_offs, int mdbg
 .macro make_do_loop_pp name call_scan do_md
 .global \name
 \name:
@@ -175,6 +175,8 @@ Pico32xNativePal:
     add     r11,r11,#8
     mov     r6, #320
     add     r5, r1, r12, lsl #1 @ p32x = dram + dram[l]
+    and     r12,r2, #0x100      @ shift
+    add     r5, r5, r12,lsr #8
 
 2: @ loop_inner:
     do_pixel_pp \do_md
@@ -185,7 +187,7 @@ Pico32xNativePal:
 
 
 @ run length
-@ unsigned short *dst, unsigned short *dram, int lines_offs, int mdbg
+@ unsigned short *dst, unsigned short *dram, int lines_sft_offs, int mdbg
 .macro make_do_loop_rl name call_scan do_md
 .global \name
 \name:

diff --git a/pico/32x/memory.c b/pico/32x/memory.c
index 999a060..82984d9 100644 (file)
--- a/pico/32x/memory.c
+++ b/pico/32x/memory.c
@@ -341,6 +341,9 @@ static void p32x_vdp_write8(u32 a, u32 d)
         Pico32x.dirty_pal = 1;
       r[0] = (r[0] & P32XV_nPAL) | (d & 0xff);
       break;
+    case 0x03: // shift (for pp mode)
+      r[2 / 2] = d & 1;
+      break;
     case 0x05: // fill len
       r[4 / 2] = d & 0xff;
       break;
@@ -1050,8 +1053,9 @@ static int REGPARM(3) sh2_write8_cs0(u32 a, u32 d, int id)
   return sh2_write8_unmapped(a, d, id);
 }
 
+/* quirk: in both normal and overwrite areas only nonzero values go through */
 #define sh2_write8_dramN(n) \
-  if (!(a & 0x20000) || d) { \
+  if ((d & 0xff) != 0) { \
     u8 *dram = (u8 *)Pico32xMem->dram[n]; \
     dram[(a & 0x1ffff) ^ 1] = d; \
   } \

diff --git a/pico/draw.c b/pico/draw.c
index 168a6ea..1781b9e 100644 (file)
--- a/pico/draw.c
+++ b/pico/draw.c
@@ -1566,10 +1566,12 @@ void PicoDrawSetOutFormat(pdso_t which, int allow_32x)
   rendstatus_old = -1;\r
 }\r
 \r
+// note: may be called on the middle of frame\r
 void PicoDrawSetOutBuf(void *dest, int increment)\r
 {\r
   DrawLineDestBase = dest;\r
   DrawLineDestIncrement = increment;\r
+  DrawLineDest = DrawLineDestBase + DrawScanline * increment;\r
 }\r
 \r
 void PicoDrawSetInternalBuf(void *dest, int increment)\r
@@ -1577,6 +1579,7 @@ void PicoDrawSetInternalBuf(void *dest, int increment)
   if (dest != NULL) {\r
     HighColBase = dest;\r
     HighColIncrement = increment;\r
+    HighCol = HighColBase + DrawScanline * increment;\r
   }\r
   else {\r
     HighColBase = DefHighCol;\r

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 3f50b4f..48d8e29 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -437,6 +437,8 @@ typedef struct
 #define P32XV_PRI   (1<< 7)\r
 #define P32XV_Mx    (3<< 0) // display mode mask\r
 \r
+#define P32XV_SFT   (1<< 0)\r
+\r
 #define P32XV_VBLK  (1<<15)\r
 #define P32XV_HBLK  (1<<14)\r
 #define P32XV_PEN   (1<<13)\r

diff --git a/platform/linux/emu.c b/platform/linux/emu.c
index 7dc2c14..0ef599d 100644 (file)
--- a/platform/linux/emu.c
+++ b/platform/linux/emu.c
@@ -156,6 +156,8 @@ static void apply_renderer(void)
                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 change, int is_menu)\r
@@ -220,7 +222,9 @@ void pemu_forced_frame(int opts)
        PicoOpt &= ~POPT_ALT_RENDERER;\r
        PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites\r
 \r
-       PicoDrawSetOutFormat(PDF_RGB555, 0);\r
+       PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+       PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
+       PicoDraw32xSetFrameMode(0, 0);\r
 \r
        Pico.m.dirtyPal = 1;\r
        PicoFrameDrawOnly();\r
@@ -311,7 +315,9 @@ void pemu_loop_end(void)
        PicoOpt &= ~POPT_ALT_RENDERER;\r
        PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;\r
 \r
-       PicoDrawSetOutFormat(PDF_RGB555, 0);\r
+       PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+       PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
+       PicoDraw32xSetFrameMode(0, 0);\r
        Pico.m.dirtyPal = 1;\r
        PicoFrame();\r
 \r