finally fixed interlaced mode, reimplemented frame counters

history.txt

@@ -1,6 +1,9 @@
 Genesis Plus for Gamecube
 ------------------------------
 
+[NGC/Wii]
+- fixed video issues in original interlaced modes
+- fixed some statibilty issues
 
 1.3.1 (20/12/2008):
 -------------------

source/ngc/gui/menu.c

@@ -1109,7 +1109,7 @@ void showrominfo ()
  * Main Menu
  *
  ****************************************************************************/
-void MainMenu ()
+void MainMenu (u32 fps)
 {
   menu = 0;
   int ret;
@@ -1139,6 +1139,7 @@ void MainMenu ()
   {
     crccheck = crc32 (0, &sram.sram[0], 0x10000);
     if (genromsize && (crccheck != sram.crc)) strcpy (menutitle, "*** SRAM has been modified ***");
+    else if (genromsize) sprintf (menutitle, "%d FPS",fps);
 
     ret = domenu (&items[0], count, 0);
     switch (ret)

source/ngc/ngc.c

@@ -130,6 +130,10 @@ int main (int argc, char *argv[])
   DI_Init();
 #endif
 
+  uint32 RenderedFrames;
+  uint32 TotalFrames;
+  uint32 FramesPerSecond;
+
   /* initialize OGC subsystems */
   ogc_video__init();
   ogc_input__init();
@@ -192,11 +196,14 @@ int main (int argc, char *argv[])
       ogc_video__stop();
 
       /* go to menu */
-      MainMenu ();
+      MainMenu (FramesPerSecond);
       ConfigRequested = 0;
 
       /* reset frame sync */
       frameticker     = 0;
+      RenderedFrames  = 0;
+      TotalFrames     = 0;
+      FramesPerSecond = vdp_rate;
 
       /* start Audio & Video */
       ogc_audio__start();
@@ -223,9 +230,18 @@ int main (int argc, char *argv[])
       /* update video & audio */
       ogc_audio__update();
       ogc_video__update();
+      RenderedFrames++;
     }
 
     frameticker--;
+
+    TotalFrames++;
+    if (TotalFrames == vdp_rate)
+    {
+      FramesPerSecond = RenderedFrames;
+      RenderedFrames  = 0;
+      TotalFrames     = 0;
+    }
   }
 
   return 0;

source/ngc/ogc_video.c

@@ -534,12 +534,15 @@ static void gxReset(void)
   if (rmode->viTVMode & VI_NON_INTERLACE) VIDEO_WaitVSync();
   else while (VIDEO_GetNextField() != odd_frame)  VIDEO_WaitVSync();
 
-  /* resynchronize field & restore VSYNC handler */
+  /* resynchronize interlaced field */
+  if (interlaced && !config.render)
+  {
     whichfb = odd_frame;
     VIDEO_SetPreRetraceCallback(xfb_swap);
     VIDEO_Flush();
     VIDEO_WaitVSync();
   }
+}
 
 /* Set Menu Video mode */
 void ogc_video__stop(void)
@@ -560,8 +563,8 @@ void ogc_video__stop(void)
 void ogc_video__start()
 {
   /* clear screen */
-  VIDEO_ClearFrameBuffer(vmode, xfb[whichfb], COLOR_BLACK);
+  VIDEO_ClearFrameBuffer(vmode, xfb[0], COLOR_BLACK);
-  VIDEO_ClearFrameBuffer(vmode, xfb[whichfb], COLOR_BLACK);
+  VIDEO_ClearFrameBuffer(vmode, xfb[1], COLOR_BLACK);
   VIDEO_Flush();
   VIDEO_WaitVSync();
 
@@ -654,14 +657,29 @@ void ogc_video__update()
   draw_square ();
   GX_DrawDone ();
 
-  /* special case: interlaced display */
+  /* single-field interlaced display requires proper sync*/
-  if (interlaced && !config.render && (odd_frame == whichfb))
+  if (interlaced && !config.render)
   {
-    /* resynchronize frame emulation */
+    /* desync */
+    if (odd_frame == whichfb)
+    {
+      /* force field resync */
       odd_frame = whichfb ^ 1;
     }
     else
     {
+      /* copy EFB to proper XFB */
+      GX_CopyDisp (xfb[whichfb], GX_TRUE);
+      GX_Flush ();
+    }
+  }
+  else
+  {
+    /* swap XFB */
+    whichfb ^= 1;
+    VIDEO_SetNextFramebuffer (xfb[whichfb]);
+    VIDEO_Flush ();
+
     /* copy EFB to current XFB */
     GX_CopyDisp (xfb[whichfb], GX_TRUE);
     GX_Flush ();

source/ngc/osd.h

@@ -30,7 +30,7 @@ extern void reloadrom();
 extern void ClearGGCodes();
 extern void GetGGEntries();
 extern void legal();
-extern void MainMenu();
+extern void MainMenu(u32 fps);
 extern void set_region();
 extern int ManageSRAM(u8 direction, u8 device);
 extern int ManageState(u8 direction, u8 device);

source/sound/fm.c

@@ -1011,7 +1011,6 @@ INLINE void advance_eg_channel(FM_SLOT *SLOT)
           }
         }
         break;
-      
     }
 
     unsigned int out = (UINT32)SLOT->volume;
@@ -1229,7 +1228,8 @@ INLINE void refresh_fc_eg_slot(FM_SLOT *SLOT , int fc , int kc )
 /* update phase increment counters */
 INLINE void refresh_fc_eg_chan(FM_CH *CH )
 {
-  if( CH->SLOT[SLOT1].Incr==-1){
+  if( CH->SLOT[SLOT1].Incr==-1)
+  {
     int fc = CH->fc;
     int kc = CH->kcode;
     refresh_fc_eg_slot(&CH->SLOT[SLOT1] , fc , kc );
@@ -1662,8 +1662,8 @@ static void OPNWriteReg(int r, int v)
           CH->block_fnum = (blk<<11) | fn;
 
           CH->SLOT[SLOT1].Incr=-1;
-        }
           break;
+        }
         case 1:    /* 0xa4-0xa6 : FNUM2,BLK */
           ym2612.OPN.ST.fn_h = v&0x3f;
           break;
@@ -1695,8 +1695,8 @@ static void OPNWriteReg(int r, int v)
           CH->ALGO = v&7;
           CH->FB   = feedback ? feedback+6 : 0;
           setup_connection( CH, c );
-        }
           break;        
+        }
         case 1:    /* 0xb4-0xb6 : L , R , AMS , PMS (ym2612/YM2610B/YM2610/YM2608) */
           /* b0-2 PMS */
           CH->pms = (v & 7) * 32; /* CH->pms = PM depth * 32 (index in lfo_pm_table) */
@@ -1707,7 +1707,6 @@ static void OPNWriteReg(int r, int v)
           /* PAN :  b7 = L, b6 = R */
           ym2612.OPN.pan[ c*2   ] = (v & 0x80) ? ~0 : 0;
           ym2612.OPN.pan[ c*2+1 ] = (v & 0x40) ? ~0 : 0;
-
           break;
       }
       break;

source/system.c

@@ -130,7 +130,7 @@ int system_frame (int do_skip)
   /* parse sprites for line 0 (done on last line) */
   parse_satb (0x80);
 
-  /* process frame */
+  /* process scanlines */
   for (line = 0; line < lines_per_frame; line ++)
   {
     /* update VCounter */

source/vdp.c

@@ -908,7 +908,7 @@ unsigned int vdp_hvc_r(void)
 void vdp_test_w(unsigned int value)
 {
 #ifdef LOGERROR
-  error("Unused VDP Write 0x%x (%08x)", value, m68k_get_reg (NULL, M68K_REG_PC));
+  error("Unused VDP Write 0x%x (%08x)\n", value, m68k_get_reg (NULL, M68K_REG_PC));
 #endif
 }