diff --git a/src/game/main.c b/src/game/main.c index b104b7f2..b0e793ed 100644 --- a/src/game/main.c +++ b/src/game/main.c @@ -79,6 +79,8 @@ void aurora_log_callback(AuroraLogLevel level, const char *message, unsigned int abort(); } } + +void VICallPostRetraceCallback(s32 retraceCount); #endif #ifdef TARGET_PC @@ -182,13 +184,9 @@ void main(void) pfDrawFonts(); HuPerfEnd(1); -#ifdef TARGET_PC - imgui_main(&auroraInfo); - aurora_end_frame(); -#endif - msmMusFdoutEnd(); HuSysDoneRender(retrace); + GXReadGPMetric(&met0, &met1); GXReadVCacheMetric(&vcheck, &vmiss, &vstall); GXReadPixMetric(&top_pixels_in, &top_pixels_out, &bot_pixels_in, &bot_pixels_out, &clr_pixels_in, &total_copy_clks); @@ -197,6 +195,10 @@ void main(void) GlobalCounter++; #ifdef TARGET_PC + imgui_main(&auroraInfo); + aurora_end_frame(); + // TODO PC remove + VICallPostRetraceCallback(0); frame_limiter(); #endif } diff --git a/src/port/stubs.c b/src/port/stubs.c index 225f6640..bfa5e413 100644 --- a/src/port/stubs.c +++ b/src/port/stubs.c @@ -1,4 +1,5 @@ #include "dolphin/gx/GXVert.h" +#include "dolphin/vitypes.h" #include #include #include @@ -527,11 +528,18 @@ void SISetSamplingRate(u32 msec) puts("SISetSamplingRate is a stub"); } +VIRetraceCallback postRetraceCallback = NULL; + VIRetraceCallback VISetPostRetraceCallback(VIRetraceCallback callback) { - puts("VISetPostRetraceCallback is a stub"); - // TODO - return callback; + postRetraceCallback = callback; + return NULL; +} + +void VICallPostRetraceCallback(s32 retraceCount) +{ + if (postRetraceCallback != NULL) + postRetraceCallback(retraceCount); } void GXSetGPMetric(GXPerf0 perf0, GXPerf1 perf1) @@ -674,7 +682,8 @@ void GXResetWriteGatherPipe(void) puts("GXResetWriteGatherPipe is a stub"); } -void ARQInit(void) { +void ARQInit(void) +{ puts("ARQInit is a stub"); } @@ -683,16 +692,13 @@ void HuDvdErrDispInit(GXRenderModeObj *rmode, void *xfb1, void *xfb2) { } void msmSysRegularProc(void) { - puts("msmSysRegularProc is a stub"); } -void msmMusFdoutEnd(void) -{ -} +void msmMusFdoutEnd(void) { } s32 HuSoftResetButtonCheck(void) { - //puts("HuSoftResetButtonCheck is a stub"); + // puts("HuSoftResetButtonCheck is a stub"); return 0; }