Remove optick

Author: Antidote

.gitmodules

@@ -25,10 +25,6 @@
 [submodule "extern/nativefiledialog-extended"]
 	path = extern/nativefiledialog-extended
 	url = https://github.com/btzy/nativefiledialog-extended
-[submodule "extern/optick"]
-	path = extern/optick
-	url = https://github.com/AxioDL/optick.git
-	branch = master
 [submodule "extern/aurora"]
 	path = extern/aurora
 	url = https://github.com/encounter/aurora.git

Runtime/AutoMapper/CMapArea.cpp

@@ -78,7 +78,7 @@ CMapArea::CMapArea(CInputStream& in, u32 size)
 }
 
 void CMapArea::PostConstruct() {
-  OPTICK_EVENT();
+//  OPTICK_EVENT();
   x38_moStart = x44_buf.get();
   x3c_vertexStart = x38_moStart + (x28_mappableObjCount * 0x50);
   x40_surfaceStart = x3c_vertexStart + (x2c_vertexCount * 12);

Runtime/CDvdFile.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/CDvdFile.hpp"
 
-#include <optick.h>
+//#include <optick.h>
 
 #include "Runtime/CDvdRequest.hpp"
 #include "Runtime/CStopwatch.hpp"
@@ -154,7 +154,7 @@ void CDvdFile::DoWork() {
 
 void CDvdFile::WorkerProc() {
 #ifdef HAS_DVD_THREAD
-  OPTICK_THREAD("CDvdFile");
+  //OPTICK_THREAD("CDvdFile");
 
   while (m_WorkerRun.load()) {
     std::unique_lock lk{m_WorkerMutex};

Runtime/CFactoryMgr.cpp

@@ -4,7 +4,7 @@
 #include <array>
 #include <cctype>
 #include <iterator>
-#include "optick.h"
+//#include "optick.h"
 
 #include "Runtime/CStopwatch.hpp"
 #include "Runtime/IObj.hpp"
@@ -36,7 +36,7 @@ bool CFactoryMgr::CanMakeMemory(const metaforce::SObjectTag& tag) const {
 CFactoryFnReturn CFactoryMgr::MakeObjectFromMemory(const SObjectTag& tag, std::unique_ptr<u8[]>&& buf, int size,
                                                    bool compressed, const CVParamTransfer& paramXfer,
                                                    CObjectReference* selfRef) {
-  OPTICK_EVENT();
+  //OPTICK_EVENT();
   std::unique_ptr<u8[]> localBuf = std::move(buf);
 
   const auto memFactoryIter = x24_memFactories.find(tag.type);

Runtime/CMain.cpp

@@ -270,7 +270,7 @@ struct Application {
     const auto targetFrameTime = getTargetFrameTime();
     bool skipRetrace = false;
     if (g_ResFactory != nullptr) {
-      OPTICK_EVENT("Async Load Resources");
+//      OPTICK_EVENT("Async Load Resources");
       const auto idleTime = m_limiter.SleepTime(targetFrameTime);
       skipRetrace = g_ResFactory->AsyncIdle(idleTime);
     }
@@ -281,12 +281,12 @@ struct Application {
     } else {
       // No more to load, and we're under frame time
       {
-        OPTICK_EVENT("Sleep");
+        //OPTICK_EVENT("Sleep");
         m_limiter.Sleep(targetFrameTime);
       }
     }
 
-    OPTICK_FRAME("MainThread");
+    //OPTICK_FRAME("MainThread");
 
     // Check if fullscreen has been toggled, if so set the fullscreen cvar accordingly
     if (m_fullscreenToggleRequested) {
@@ -350,7 +350,7 @@ struct Application {
   }
 
   void onAppDraw() noexcept {
-    OPTICK_EVENT("Draw");
+    //OPTICK_EVENT("Draw");
     if (g_Renderer != nullptr) {
       g_Renderer->BeginScene();
       if (g_mainMP1) {
@@ -362,7 +362,7 @@ struct Application {
   }
 
   void onAppPostDraw() noexcept {
-    OPTICK_EVENT("PostDraw");
+    //OPTICK_EVENT("PostDraw");
 //    if (m_voiceEngine) {
 //      m_voiceEngine->pumpAndMixVoices();
 //    }

Runtime/CMakeLists.txt

@@ -149,7 +149,7 @@ function(add_runtime_common_library name)
 endfunction()
 
 set(RUNTIME_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-set(RUNTIME_LIBRARIES zeus nod NESEmulator libjpeg-turbo jbus kabufuda OptickCore
+set(RUNTIME_LIBRARIES zeus nod NESEmulator libjpeg-turbo jbus kabufuda #OptickCore
     imgui_support aurora::core aurora::gx aurora::pad aurora::si aurora::vi aurora::mtx spdlog::spdlog $<$<BOOL:${WIN32}>:nowide::nowide>
     ${ZLIB_LIBRARIES}
     )

Runtime/CResFactory.cpp

@@ -5,7 +5,7 @@
 #include "Runtime/Logging.hpp"
 #include "Runtime/Formatting.hpp"
 
-#include "optick.h"
+//#include "optick.h"
 
 namespace metaforce {
 void CResFactory::AddToLoadList(SLoadingData&& data) {
@@ -35,7 +35,7 @@ CFactoryFnReturn CResFactory::BuildSync(const SObjectTag& tag, const CVParamTran
 }
 
 bool CResFactory::PumpResource(SLoadingData& data) {
-  OPTICK_EVENT();
+  //OPTICK_EVENT();
   if (data.x8_dvdReq && data.x8_dvdReq->IsComplete()) {
     data.x8_dvdReq.reset();
     *data.xc_targetPtr =
@@ -77,7 +77,7 @@ void CResFactory::BuildAsync(const SObjectTag& tag, const CVParamTransfer& xfer,
 }
 
 bool CResFactory::AsyncIdle(std::chrono::nanoseconds target) {
-  OPTICK_EVENT();
+  //OPTICK_EVENT();
   if (m_loadList.empty()) {
     return false;
   }

Runtime/CStateManager.cpp

@@ -776,7 +776,7 @@ void CStateManager::DrawWorld() {
   g_Renderer->SetThermalColdScale(xf28_thermColdScale2 + xf24_thermColdScale1);
 
   for (int i = areaCount - 1; i >= 0; --i) {
-    OPTICK_EVENT("CStateManager::DrawWorld DrawArea");
+    //OPTICK_EVENT("CStateManager::DrawWorld DrawArea");
     const CGameArea& area = *areaArr[i];
     SetupFogForArea(area);
     g_Renderer->EnablePVS(pvsArr[i], area.x4_selfIdx);
@@ -1375,7 +1375,7 @@ void CStateManager::LoadScriptObjects(TAreaId aid, CInputStream& in, std::vector
 
 std::pair<TEditorId, TUniqueId> CStateManager::LoadScriptObject(TAreaId aid, EScriptObjectType type, u32 length,
                                                                 CInputStream& in) {
-  OPTICK_EVENT();
+  //OPTICK_EVENT();
   const TEditorId id = in.ReadLong();
   const u32 connCount = in.ReadLong();
   length -= 8;

Runtime/Character/CAnimData.cpp

@@ -551,7 +551,7 @@ void CAnimData::Render(CSkinnedModel& model, const CModelFlags& drawFlags, CVert
 }
 
 void CAnimData::SetupRender(CSkinnedModel& model, CVertexMorphEffect* morphEffect, TConstVectorRef averagedNormals) {
-  OPTICK_EVENT();
+  //OPTICK_EVENT();
   if (!x220_30_poseBuilt) {
     x2fc_poseBuilder.BuildNoScale(x224_pose);
     x220_30_poseBuilt = true;

Runtime/Graphics/CGraphics.cpp

@@ -653,7 +653,7 @@ float CGraphics::GetSecondsMod900() {
 }
 
 void CGraphics::TickRenderTimings() {
-  OPTICK_EVENT();
+  //OPTICK_EVENT();
   mRenderTimings = (mRenderTimings + 1) % (900 * 60);
   mSecondsMod900 = static_cast<float>(mRenderTimings) / 60.f;
 }