From 8c559f3d5462d77e1f7119f47b4c7d7745e715e3 Mon Sep 17 00:00:00 2001
From: illusion0001 <37698908+illusion0001@users.noreply.github.com>
Date: Wed, 5 Jul 2023 19:40:16 -0500
Subject: [PATCH] Update main.c

---
 plugin_src/frame_logger/source/main.c | 32 ++-------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/plugin_src/frame_logger/source/main.c b/plugin_src/frame_logger/source/main.c
index 4f406152..e24ff663 100644
--- a/plugin_src/frame_logger/source/main.c
+++ b/plugin_src/frame_logger/source/main.c
@@ -19,17 +19,11 @@ attr_public const char *g_pluginAuth = "illusion";
 attr_public u32 g_pluginVersion = 0x00000100; // 1.00
 
 int32_t sceGnmSubmitAndFlipCommandBuffers(uint32_t count, void *dcbGpuAddrs[], uint32_t *dcbSizesInBytes, void *ccbGpuAddrs[], uint32_t *ccbSizesInBytes, uint32_t videoOutHandle, uint32_t displayBufferIndex, uint32_t flipMode, int64_t flipArg);
-#ifdef HOOK_WORKLOAD
-int32_t sceGnmSubmitAndFlipCommandBuffersForWorkload(uint64_t workload, uint32_t count, void *dcbGpuAddrs[], uint32_t *dcbSizesInBytes, void *ccbGpuAddrs[], uint32_t *ccbSizesInBytes, uint32_t videoOutHandle, uint32_t displayBufferIndex, uint32_t flipMode, int64_t flipArg);
-#endif
 
 HOOK_INIT(sceGnmSubmitAndFlipCommandBuffers);
-#ifdef HOOK_WORKLOAD
-HOOK_INIT(sceGnmSubmitAndFlipCommandBuffersForWorkload);
-#endif
 
 FILE *g_LogFILE = NULL;
-uint32_t g_isRecording = false;
+bool g_isRecording = false;
 uint64_t g_TimeStart = 0;
 uint64_t g_CurrentDelta = 0;
 double g_TscTick = 0;
@@ -62,25 +56,11 @@ int32_t sceGnmSubmitAndFlipCommandBuffers_hook(uint32_t count, void *dcbGpuAddrs
                          count, dcbGpuAddrs, dcbSizesInBytes, ccbGpuAddrs, ccbSizesInBytes, videoOutHandle, displayBufferIndex, flipMode, flipArg);
 }
 
-#ifdef HOOK_WORKLOAD
-int32_t sceGnmSubmitAndFlipCommandBuffersForWorkload_hook(uint64_t workload, uint32_t count, void *dcbGpuAddrs[], uint32_t *dcbSizesInBytes, void *ccbGpuAddrs[], uint32_t *ccbSizesInBytes, uint32_t videoOutHandle, uint32_t displayBufferIndex, uint32_t flipMode, int64_t flipArg)
-{
-    if (!g_GnmHook)
-    {
-        g_GnmHook = true;
-    }
-    doStats();
-    return HOOK_CONTINUE(sceGnmSubmitAndFlipCommandBuffersForWorkload,
-                         int32_t(*)(uint64_t, uint32_t, void **, uint32_t *, void **, uint32_t *, uint32_t, uint32_t, uint32_t, int64_t),
-                         workload, count, dcbGpuAddrs, dcbSizesInBytes, ccbGpuAddrs, ccbSizesInBytes, videoOutHandle, displayBufferIndex, flipMode, flipArg);
-}
-#endif
-
 struct tm get_local_time(void)
 {
     int32_t tz_offset = 0;
     int32_t tz_dst = 0;
-    int32_t ret;
+    int32_t ret = 0;
 
     if ((ret = sceSystemServiceParamGetInt(ORBIS_SYSTEM_SERVICE_PARAM_ID_TIME_ZONE, &tz_offset)) < 0)
     {
@@ -244,12 +224,7 @@ s32 attr_public plugin_load(s32 argc, const char *argv[])
 
     OrbisPthread thread;
     scePthreadCreate(&thread, NULL, frame_logger_input_thread, NULL, STRINGIFY(frame_logger_input_thread));
-
-    // end
     HOOK32(sceGnmSubmitAndFlipCommandBuffers);
-#ifdef HOOK_WORKLOAD
-    HOOK32(sceGnmSubmitAndFlipCommandBuffersForWorkload);
-#endif
     return 0;
 }
 
@@ -257,9 +232,6 @@ s32 attr_public plugin_unload(s32 argc, const char *argv[])
 {
     final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
     UNHOOK(sceGnmSubmitAndFlipCommandBuffers);
-#ifdef HOOK_WORKLOAD
-    UNHOOK(sceGnmSubmitAndFlipCommandBuffersForWorkload);
-#endif
     return 0;
 }