timer progress

CTR-tools · Feb 16, 2025 · 2110e50 · 2110e50
1 parent 439ed10
commit 2110e50
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 19 deletions.
diff --git a/decompile/General/MAIN/MainFrame_08_RenderFrame.c b/decompile/General/MAIN/MainFrame_08_RenderFrame.c
@@ -386,9 +386,10 @@ void DECOMP_MainFrame_RenderFrame(struct GameTracker* gGT, struct GamepadSystem*
 
 	RenderDispEnv_UI(gGT);
 
-#if 1
-	// leftover debug unused
-	gGT->countTotalTime =
+#if 0
+	// leftover debug unused,
+	// clockDurationStall = sysclock (do NOT print)
+	gGT->clockDurationStall =
 		Timer_GetTime_Total();
 #endif
 
@@ -398,10 +399,11 @@ void DECOMP_MainFrame_RenderFrame(struct GameTracker* gGT, struct GamepadSystem*
 	RenderFMV();
 #endif
 
-#if 1
-	// leftover debug unused
-	gGT->countTotalTime =
-		Timer_GetTime_Elapsed(gGT->countTotalTime,0);
+#if 0
+	// leftover debug unused,
+	// clockDurationStall = time since stall started (NOW print)
+	gGT->clockDurationStall =
+		Timer_GetTime_Elapsed(gGT->clockDurationStall,0);
 #endif
 
 	RenderSubmit(gGT);
@@ -1702,10 +1704,6 @@ void RenderVSYNC(struct GameTracker* gGT)
 		VSync(0);
 	}
 
-	#ifdef USE_ONLINE
-	int boolFirstFrame = 1;
-	#endif
-
 	while(1)
 	{
 
@@ -1721,13 +1719,6 @@ void RenderVSYNC(struct GameTracker* gGT)
 			return;
 		}
 
-#ifdef USE_ONLINE
-		// gpu submission is not too late,
-		// we got to this while() loop before
-		// the flip was ready, so we're on-time
-		boolFirstFrame = 0;
-#endif
-
 #ifndef REBUILD_PC
 		if(ReadyToBreak(gGT))
 		{

diff --git a/ghidra/MAIN.c b/ghidra/MAIN.c
@@ -3801,10 +3801,17 @@ void FUN_80035e70(uint *param_1)
   // 0x51f = 0x147c = pushBuffer_UI + 0xf4 (ptrOT)
   FUN_80042a8c(param_1[0x51f] + 0x10,param_1 + 0x4e2,param_1[4],0,0);
 
+
+#if 0
+  // leftover debug unused,
+  // clockDurationStall = sysclock (do NOT print)
+
   // Timer_GetTime_Total
   uVar7 = FUN_8004b3a4();
   puVar14 = PTR_DAT_8008d2ac;
   param_1[0x737] = uVar7;
+#endif
+
 
   // gGT->256c & checkered flag
   if ((*(uint *)(puVar14 + 0x256c) & 0x1000) != 0) {
@@ -3849,12 +3856,21 @@ void FUN_80035e70(uint *param_1)
 	DrawSync(0);
   }
 
+
+
+#if 0
+  // leftover debug unused,
+  // clockDurationStall = time since stall started (NOW print)
+
   // param1 is PTR_DAT_8008d2ac
 
   // 737 -> 1cdc
   // Timer_GetTime_Elapsed
   uVar7 = FUN_8004b41c(param_1[0x737],0);
   param_1[0x737] = uVar7;
+#endif
+
+
 
   // if frontBuffer exists
   if (param_1[5] != 0)

diff --git a/include/namespace_Main.h b/include/namespace_Main.h
@@ -364,7 +364,7 @@ struct GameTracker
 	int unk1cc4[6];
 
 	// 1cdc
-	int countTotalTime;
+	int clockDurationStall;
 
 	// 1ce0
 	int vSync_between_drawSync;