X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoFrameHints.c;h=c8f8946f5beb36515654a859ac2f07bd4ad02b68;hb=fad248933b6676d30ccf419858b4ee10cc123fc5;hp=562229f7b7e739f3b30d037852972b67ddedface;hpb=5f20bb80364b4a30149bbb6a7e73af3209532e56;p=picodrive.git

diff --git a/Pico/PicoFrameHints.c b/Pico/PicoFrameHints.c
index 562229f..c8f8946 100644
--- a/Pico/PicoFrameHints.c
+++ b/Pico/PicoFrameHints.c
@@ -1,3 +1,6 @@
+// common code for Pico.c and cd/Pico.c
+// (c) Copyright 2007,2008 Grazvydas "notaz" Ignotas
+
 #define CYCLES_M68K_LINE     488 // suitable for both PAL/NTSC
 #define CYCLES_M68K_VINT_LAG  68
 #define CYCLES_M68K_ASD      148
@@ -22,7 +25,7 @@
     else { \
       cnt = SekCyclesDone() - z80startCycle; \
       cnt = (cnt>>1)-(cnt>>5); \
-      if (cnt > (z80_cycles)) cnt = z80_cycles; \
+      if (cnt < 0 || cnt > (z80_cycles)) cnt = z80_cycles; \
       Pico.m.z80Run |= 2; \
       z80CycleAim+=cnt; \
     } \
@@ -54,10 +57,20 @@
 static int PicoFrameHints(void)
 {
   struct PicoVideo *pv=&Pico.video;
-  int lines,y,lines_vis = 224,total_z80 = 0,z80CycleAim = 0,line_sample;
-  int skip=PicoSkipFrame || (PicoOpt&0x10);
+  int lines, y, lines_vis = 224, total_z80 = 0, z80CycleAim = 0, line_sample, skip;
   int hint; // Hint counter
 
+  if ((PicoOpt&0x10) && !PicoSkipFrame && (pv->reg[1]&0x40)) { // fast rend., display enabled
+    // draw a frame just after vblank in alternative render mode
+    // yes, this will cause 1 frame lag, but this is inaccurate mode anyway.
+    PicoFrameFull();
+#ifdef DRAW_FINISH_FUNC
+    DRAW_FINISH_FUNC();
+#endif
+    skip = 1;
+  }
+  else skip=PicoSkipFrame;
+
   if (Pico.m.pal) {
     //cycles_68k = (int) ((double) OSC_PAL  /  7 / 50 / 312 + 0.4); // should compile to a constant (488)
     //cycles_z80 = (int) ((double) OSC_PAL  / 15 / 50 / 312 + 0.4); // 228
@@ -112,21 +125,37 @@ static int PicoFrameHints(void)
     }
 
     // decide if we draw this line
+    if (!skip)
+    {
+      if (PicoOpt&0x10) {
+        // find the right moment for fast 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(!skip && ((!(pv->reg[1]&8) && y<224) || (pv->reg[1]&8)) )
+        if (((!(pv->reg[1]&8) && y < 224) || (pv->reg[1]&8)) )
 #else
-    if(!skip && y<224)
+        if (y < 224)
 #endif
-      PicoLine(y);
+          PicoLine(y);
+      }
+    }
 
-    if(PicoOpt&1)
-      sound_timers_and_dac(y);
+    if (PicoOpt&1)
+      Psnd_timers_and_dac(y);
 
 #ifndef PICO_CD
     // get samples from sound chips
-    if(y == 32 && PsndOut)
+    if (y == 32 && PsndOut)
       emustatus &= ~1;
-    else if((y == 224 || y == line_sample) && PsndOut)
+    else if ((y == 224 || y == line_sample) && PsndOut)
       getSamples(y);
 #endif
 
@@ -136,9 +165,16 @@ static int PicoFrameHints(void)
 
 #ifdef PICO_CD
     update_chips();
+#else
+    if (PicoLineHook) PicoLineHook(1);
 #endif
   }
 
+#ifdef DRAW_FINISH_FUNC
+  if (!skip)
+    DRAW_FINISH_FUNC();
+#endif
+
   // V-int line (224 or 240)
   Pico.m.scanline=(short)y;
 
@@ -177,7 +213,7 @@ static int PicoFrameHints(void)
     z80_int();
 
   if (PicoOpt&1)
-    sound_timers_and_dac(y);
+    Psnd_timers_and_dac(y);
 
   // get samples from sound chips
 #ifndef PICO_CD
@@ -192,7 +228,9 @@ static int PicoFrameHints(void)
     CYCLES_Z80_LINE - CYCLES_Z80_ASD, CYCLES_S68K_LINE - CYCLES_S68K_ASD);
 
 #ifdef PICO_CD
-    update_chips();
+  update_chips();
+#else
+  if (PicoLineHook) PicoLineHook(1);
 #endif
 
   // PAL line count might actually be 313 according to Steve Snake, but that would complicate things.
@@ -208,7 +246,7 @@ static int PicoFrameHints(void)
 #endif
 
     if(PicoOpt&1)
-      sound_timers_and_dac(y);
+      Psnd_timers_and_dac(y);
 
     // Run scanline:
     if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
@@ -216,13 +254,11 @@ static int PicoFrameHints(void)
 
 #ifdef PICO_CD
     update_chips();
+#else
+    if (PicoLineHook) PicoLineHook(1);
 #endif
   }
 
-  // draw a frame just after vblank in alternative render mode
-  if (!PicoSkipFrame && (PicoOpt&0x10))
-    PicoFrameFull();
-
   return 0;
 }