fixes for Niko's profiler

Author: mateusfavarin

include/ctr/coll.h

@@ -23,6 +23,13 @@ typedef enum BarycentricTest
     BARYCENTRIC_TEST_INSIDE_TRIANGLE = 6,
 } BarycentricTest;
 
+typedef enum CollFlags
+{
+    COLLFLAGS_TEST_INSTANCES = 0x1,
+    COLLFLAGS_HIGH_LOD_QUAD = 0x2,
+    COLLFLAGS_CACHED_HIGH_LOD_VERTICES = 0x8,
+} CollFlags;
+
 typedef struct CollVertex
 {
     SVec3 pos;
@@ -48,9 +55,8 @@ typedef struct DriverQuadblockCollData
     s32 driverHitRadiusSquared;
     SVec3 driverNextPos;
     u16 collFlags;
-    u16 searchFlags;
-    s16 unk0;
-    u32 skipCollNoQuadFlagsMatch;
+    u32 quadFlagsCheckColl;
+    u32 quadFlagsIgnoreColl;
 } DriverQuadblockCollData;
 
 typedef union CollInputData
@@ -97,7 +103,7 @@ typedef struct CollDCache
     u8 lodShift;
 } CollDCache;
 
-#define DCACHE_COLL (*(CollDCache*) 0x1f800000)
+#define DCACHE_COLL (*(CollDCache*) 0x1f800108)
 
 void COLL_ProjectPointToEdge(SVec3* out, const SVec3* v1, const SVec3* v2, const SVec3* point);
 void COLL_LoadQuadblockData_LowLOD(CollDCache* cache, Quadblock* quadblock);

include/ctr/profiler.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#define REWRITE_PROFILER
+//#define REWRITE_PROFILER
 
 void LoadProfilerPatches();

include/ctr/test.h

@@ -26,7 +26,7 @@ force_inline void FlushCache()
 
 //#define TEST_MATH_IMPL
 //#define TEST_RNG_IMPL
-//#define TEST_COLL_IMPL
+#define TEST_COLL_IMPL
 
 #ifdef TEST_MATH_IMPL
     void TEST_MATH_Sin(u32 angle, s32 ret);

rewrite/src/profiler/profiler.c

@@ -1,5 +1,8 @@
 
 #include <ctr/profiler.h>
+
+#ifdef REWRITE_PROFILER
+
 #include <ctr/nd.h>
 #include <ctr/test.h>
 
@@ -56,17 +59,17 @@ struct GameTracker_Local
 
 	// 0x18
 	struct DB db[2];			/* packet double buffer */
-	
+
 	// 0x160
 	char buf[0x1768];
-	
+
 	// pointers to OT memory,
 	// used in ClearOTagR
 	// 0x18c8
 	// 0x18cc
 	// one for each DB
 	void* otSwapchainDB[2];
-	
+
 };
 
 void DrawResults()
@@ -88,9 +91,9 @@ void DrawResults()
 		// 0x100 - midpoint, 0x800 - center
 		ND_sprintf(string, "%s    %s", __DATE__, __TIME__);
 		ND_DecalFont_DrawLine(string, 0x100, 0x8, 2, 0x8000);
-		
+
 		int numTest = sizeof(tests) / sizeof(struct BenchTest);
-		
+
 		for(int i = 0; i < numTest; i++)
 		{
 			ND_sprintf(string, "%s  %d", &tests[i].name[8], tests[i].val);
@@ -103,37 +106,37 @@ int testIndex=0;
 void RunTest()
 {
 	int numTest = sizeof(tests) / sizeof(struct BenchTest);
-	
+
 	int timer = *(int*)(0x80096b20+0x1cec);
-	
+
 	// In between each test, run 15 frames
 	if((timer & 0xF) != 0xF)
 		return;
-	
+
 	if(testIndex < numTest)
 	{
 		// Stop XA
 		void ND_CDSYS_XAPauseForce();
 		ND_CDSYS_XAPauseForce();
-		
+
 		// From Spyro 2 Demo Launcher
 		void ND_Music_Stop();
 		void ND_howl_StopAudio(int a, int b, int c);
 		void ND_Bank_DestroyAll();
 		void ND_howl_Disable();
-		
+
 		// From Spyro 2 Demo Launcher
 		ND_Music_Stop();
 		ND_howl_StopAudio(1,1,1);
 		ND_Bank_DestroyAll();
 		ND_howl_Disable();
-		
+
 		ND_EnterCriticalSection();
 		ND_ResetRCnt(0xf2000001);
 		tests[testIndex].funcPtr();
 		tests[testIndex].val = ND_GetRCnt(0xf2000001);
 		ND_ExitCriticalSection();
-		
+
 		testIndex++;
 	}
 }
@@ -142,7 +145,7 @@ void Hook_DrawOTag(int a)
 {
 	DrawResults();
 	ND_DrawOTag(a);
-	
+
 	// Run first test AFTER first DrawOTag,
 	// so it does not take forever for screen to refresh,
 	// Therefore, always run a test after DrawOTag
@@ -153,15 +156,17 @@ void LoadProfilerPatches()
 {
 	#define JAL(dest) (((unsigned long)dest & 0x3FFFFFF) >> 2 | 0xC000000)
 	*(int*)0x800379b0 = JAL(Hook_DrawOTag);
-	
+
 	// JR RA so main menu never loads
 	*(int*)0x8003cfc0 = 0x3E00008;
 	*(int*)0x8003cfc4 = 0;
-	
+
 	// JR RA so RaceFlag does not drawpoly
 	*(int*)0x800444e8 = 0x3E00008;
 	*(int*)0x800444ec = 0;
-	
+
 	// skip XA on boot "Start Your Engines..."
 	*(int*)0x8003c958 = 0;
-}
+}
+
+#endif