X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoFrameHints.c;h=4386299e45d0f623355827dbd169cd6787719fc5;hb=fbc65db75502192750f19f5cc8c5543aef625cb1;hp=b224c9b76176c5f4ce83f80bd7aa0c47cd3d5f6e;hpb=e53704e691c4de8c53ebe3c54e75a9ca8825bb2b;p=picodrive.git

diff --git a/Pico/PicoFrameHints.c b/Pico/PicoFrameHints.c
index b224c9b..4386299 100644
--- a/Pico/PicoFrameHints.c
+++ b/Pico/PicoFrameHints.c
@@ -35,10 +35,10 @@
 static int PicoFrameHints(void)
 {
   struct PicoVideo *pv=&Pico.video;
-  int lines, y, lines_vis = 224, line_sample, skip;
+  int lines, y, lines_vis = 224, line_sample, skip, vcnt_wrap;
   int hint; // Hint counter
 
-  Pico.m.scanline=0;
+  pv->v_counter = Pico.m.scanline = 0;
 
   if ((PicoOpt&POPT_ALT_RENDERER) && !PicoSkipFrame && (pv->reg[1]&0x40)) { // fast rend., display enabled
     // draw a frame just after vblank in alternative render mode
@@ -53,7 +53,7 @@ static int PicoFrameHints(void)
 
   if (Pico.m.pal) {
     line_sample = 68;
-    if(pv->reg[1]&8) lines_vis = 240;
+    if (pv->reg[1]&8) lines_vis = 240;
   } else {
     line_sample = 93;
   }
@@ -73,9 +73,14 @@ static int PicoFrameHints(void)
   // This is to make active scan longer (needed for Double Dragon 2, mainly)
   CPUS_RUN(CYCLES_M68K_ASD, CYCLES_S68K_ASD);
 
-  for (y=0;y<lines_vis;y++)
+  for (y = 0; y < lines_vis; y++)
   {
-    Pico.m.scanline=(short)y;
+    pv->v_counter = Pico.m.scanline = y;
+    if ((pv->reg[12]&6) == 6) { // interlace mode 2
+      pv->v_counter <<= 1;
+      pv->v_counter |= pv->v_counter >> 8;
+      pv->v_counter &= 0xff;
+    }
 
     // VDP FIFO
     pv->lwrite_cnt -= 12;
@@ -101,24 +106,15 @@ static int PicoFrameHints(void)
     }
 
     // decide if we draw this line
-    if (!skip)
+    if (!skip && (PicoOpt & POPT_ALT_RENDERER))
     {
-      if (PicoOpt&POPT_ALT_RENDERER) {
-        // find the right moment for fast renderer, when display is no longer blanked
-        if ((pv->reg[1]&0x40) || y > 100) {
-          PicoFrameFull();
+      // find the right moment for frame renderer, when display is no longer blanked
+      if ((pv->reg[1]&0x40) || y > 100) {
+        PicoFrameFull();
 #ifdef DRAW_FINISH_FUNC
-          DRAW_FINISH_FUNC();
-#endif
-          skip = 1;
-        }
-      }
-      else
-      {
-#if !CAN_HANDLE_240_LINES
-        if (y < 224)
+        DRAW_FINISH_FUNC();
 #endif
-          PicoLine(y);
+        skip = 1;
       }
     }
 
@@ -147,13 +143,19 @@ static int PicoFrameHints(void)
 #endif
   }
 
-#ifdef DRAW_FINISH_FUNC
   if (!skip)
+  {
+    if (DrawScanline < y)
+      PicoDrawSync(y - 1, 0);
+#ifdef DRAW_FINISH_FUNC
     DRAW_FINISH_FUNC();
 #endif
+  }
 
   // V-int line (224 or 240)
-  Pico.m.scanline=(short)y;
+  Pico.m.scanline = y;
+  pv->v_counter = 0xe0; // bad for 240 mode
+  if ((pv->reg[12]&6) == 6) pv->v_counter = 0xc1;
 
   // VDP FIFO
   pv->lwrite_cnt=0;
@@ -173,7 +175,6 @@ static int PicoFrameHints(void)
     if (pv->reg[0]&0x10) SekInterrupt(4);
   }
 
-  // V-Interrupt:
   pv->status|=0x08; // go into vblank
   pv->pending_ints|=0x20;
 
@@ -217,10 +218,16 @@ static int PicoFrameHints(void)
 
   // PAL line count might actually be 313 according to Steve Snake, but that would complicate things.
   lines = Pico.m.pal ? 312 : 262;
+  vcnt_wrap = Pico.m.pal ? 0x103 : 0xEB; // based on Gens
 
-  for (y++;y<lines;y++)
+  for (y++; y < lines; y++)
   {
-    Pico.m.scanline=(short)y;
+    pv->v_counter = Pico.m.scanline = y;
+    if (y >= vcnt_wrap)
+      pv->v_counter -= Pico.m.pal ? 56 : 6;
+    if ((pv->reg[12]&6) == 6)
+      pv->v_counter = (pv->v_counter << 1) | 1;
+    pv->v_counter &= 0xff;
 
     PAD_DELAY
 #ifdef PICO_CD