AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-09-21 11:49:37 +00:00
Code Issues Projects Releases Wiki Activity

Remove optick

Browse Source
This commit is contained in:
Phillip Stephens 2025-09-17 20:21:18 -07:00
parent 394ed34673
commit d900a9376e
21 changed files with 49 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -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

2
Runtime/AutoMapper/CMapArea.cpp
View File

@ -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);

4
Runtime/CDvdFile.cpp
View File

@ -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};

4
Runtime/CFactoryMgr.cpp
View File

@ -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);

10
Runtime/CMain.cpp
View File

@ -270,7 +270,7 @@ public:
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 @@ public:
} 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 @@ public:
}
void onAppDraw() noexcept {
OPTICK_EVENT("Draw");
//OPTICK_EVENT("Draw");
if (g_Renderer != nullptr) {
g_Renderer->BeginScene();
if (g_mainMP1) {
@ -362,7 +362,7 @@ public:
}
void onAppPostDraw() noexcept {
OPTICK_EVENT("PostDraw");
//OPTICK_EVENT("PostDraw");
// if (m_voiceEngine) {
// m_voiceEngine->pumpAndMixVoices();
// }

2
Runtime/CMakeLists.txt
View File

@ -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}
)

6
Runtime/CResFactory.cpp
View File

@ -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;
}

4
Runtime/CStateManager.cpp
View File

@ -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;

2
Runtime/Character/CAnimData.cpp
View File

@ -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;

2
Runtime/Graphics/CGraphics.cpp
View File

@ -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;
}

5
Runtime/Graphics/CGraphics.hpp
View File

@ -15,7 +15,7 @@
#include <zeus/CVector2i.hpp>
#include <aurora/aurora.h>
#include <optick.h>
//#include <optick.h>
#include <dolphin/mtx.h>
namespace metaforce {
@ -454,7 +454,8 @@ struct ScopedDebugGroup {
OPTICK_EVENT_DYNAMIC(name); \
ScopedDebugGroup _GfxDbg_ { name }
#else
#define SCOPED_GRAPHICS_DEBUG_GROUP(name, ...) OPTICK_EVENT_DYNAMIC(name)
#define SCOPED_GRAPHICS_DEBUG_GROUP(name, ...)
//OPTICK_EVENT_DYNAMIC(name)
#endif
} // namespace metaforce

2
Runtime/Graphics/CSkinnedModel.cpp
View File

@ -61,7 +61,7 @@ void CSkinnedModel::Calculate(const CPoseAsTransforms& pose, CVertexMorphEffect*
}
void CSkinnedModel::Draw(TConstVectorRef verts, TConstVectorRef norms, const CModelFlags& drawFlags) {
OPTICK_EVENT();
//OPTICK_EVENT();
x4_model->Draw(verts, norms, drawFlags);
// PostDrawFunc();
}

18
Runtime/GuiSys/CRasterFont.cpp
View File

@ -48,27 +48,27 @@ CRasterFont::CRasterFont(metaforce::CInputStream& in, metaforce::IObjectStore& s
float endU = in.ReadFloat();
float endV = in.ReadFloat();
s32 layer = 0;
s32 a, b, c, cellWidth, cellHeight, baseline, kernStart;
s32 leftPadding, advance, rightPadding, cellWidth, cellHeight, baseline, kernStart;
if (version < 4) {
a = in.ReadInt32();
b = in.ReadInt32();
c = in.ReadInt32();
leftPadding = in.ReadInt32();
advance = in.ReadInt32();
rightPadding = in.ReadInt32();
cellWidth = in.ReadInt32();
cellHeight = in.ReadInt32();
baseline = in.ReadInt32();
kernStart = in.ReadInt32();
} else {
layer = in.ReadInt8();
a = in.ReadInt8();
b = in.ReadInt8();
c = in.ReadInt8();
leftPadding = in.ReadInt8();
advance = in.ReadInt8();
rightPadding = in.ReadInt8();
cellWidth = in.ReadInt8();
cellHeight = in.ReadInt8();
baseline = in.ReadInt8();
kernStart = in.ReadInt16();
}
xc_glyphs.emplace_back(
chr, CGlyph(a, b, c, startU, startV, endU, endV, cellWidth, cellHeight, baseline, kernStart, layer));
xc_glyphs.emplace_back(chr, CGlyph(leftPadding, advance, rightPadding, startU, startV, endU, endV, cellWidth,
cellHeight, baseline, kernStart, layer));
}
std::sort(xc_glyphs.begin(), xc_glyphs.end(), [=](auto& a, auto& b) -> bool { return a.first < b.first; });

8
Runtime/GuiSys/CRasterFont.hpp
View File

@ -36,11 +36,11 @@ private:
public:
CGlyph() = default;
CGlyph(s16 a, s16 b, s32 c, float startU, float startV, float endU, float endV, s16 cellWidth, s16 cellHeight,
CGlyph(s16 leftPadding, s16 advance, s32 rightPadding, float startU, float startV, float endU, float endV, s16 cellWidth, s16 cellHeight,
s16 baseline, s16 kernStart, s16 layer = 0)
: x0_leftPadding(a)
, x2_advance(b)
, x4_rightPadding(c)
: x0_leftPadding(leftPadding)
, x2_advance(advance)
, x4_rightPadding(rightPadding)
, x8_startU(startU)
, xc_startV(startV)
, x10_endU(endU)

4
Runtime/ImGuiConsole.cpp
View File

@ -1329,7 +1329,7 @@ void ImGuiConsole::ToggleVisible() {
}
void ImGuiConsole::PreUpdate() {
OPTICK_EVENT();
//OPTICK_EVENT();
bool preLaunch = g_Main == nullptr;
if (!m_isInitialized) {
m_isInitialized = true;
@ -1424,7 +1424,7 @@ void ImGuiConsole::PreUpdate() {
}
void ImGuiConsole::PostUpdate() {
OPTICK_EVENT();
//OPTICK_EVENT();
if (g_StateManager != nullptr && g_StateManager->GetObjectList()) {
// Clear deleted objects
CObjectList& list = g_StateManager->GetAllObjectList();

2
Runtime/Particle/CDecalManager.cpp
View File

@ -88,7 +88,7 @@ void CDecalManager::Update(float dt, CStateManager& mgr) {
void CDecalManager::AddDecal(const TToken<CDecalDescription>& decal, const zeus::CTransform& xf, bool notIce,
CStateManager& mgr) {
OPTICK_EVENT();
//OPTICK_EVENT();
if (m_LastDecalCreatedIndex != -1 && m_DeltaTimeSinceLastDecalCreation < 0.75f &&
m_LastDecalCreatedAssetId == decal.GetObjectTag()->id) {
SDecal& existingDecal = m_DecalPool[m_LastDecalCreatedIndex];

2
Runtime/Particle/CElementGen.cpp
View File

@ -594,7 +594,7 @@ void CElementGen::UpdatePSTranslationAndOrientation() {
}
std::unique_ptr<CParticleGen> CElementGen::ConstructChildParticleSystem(const TToken<CGenDescription>& desc) const {
OPTICK_EVENT();
//OPTICK_EVENT();
auto ret = std::make_unique<CElementGen>(desc, EModelOrientationType::Normal,
x26d_27_enableOPTS ? EOptionalSystemFlags::Two : EOptionalSystemFlags::One);
ret->x26d_26_modelsUseLights = x26d_26_modelsUseLights;

2
Runtime/Weapon/CGunWeapon.cpp
View File

@ -177,7 +177,7 @@ constexpr std::array<s32, 2> CGunWeapon::skShootAnim{4, 3};
void CGunWeapon::Fire(bool underwater, float dt, EChargeState chargeState, const zeus::CTransform& xf,
CStateManager& mgr, TUniqueId homingTarget, float chargeFactor1, float chargeFactor2) {
OPTICK_EVENT();
//OPTICK_EVENT();
CDamageInfo dInfo = GetDamageInfo(mgr, chargeState, chargeFactor1);
zeus::CVector3f scale(chargeState == EChargeState::Normal ? 1.f : chargeFactor2);
bool partialCharge = chargeState == EChargeState::Normal ? false : !zeus::close_enough(chargeFactor1, 1.f);

2
Runtime/World/CGameArea.cpp
View File

@ -790,7 +790,7 @@ void CGameArea::StartStreamIn(CStateManager& mgr) {
if (xf0_24_postConstructed || xf0_27_loadPaused)
return;
OPTICK_EVENT();
//OPTICK_EVENT();
VerifyTokenList(mgr);
if (!xf0_26_tokensReady) {

14
extern/CMakeLists.txt vendored
View File

@ -29,13 +29,13 @@ add_subdirectory(nod EXCLUDE_FROM_ALL)
add_subdirectory(jbus EXCLUDE_FROM_ALL)
add_subdirectory(kabufuda EXCLUDE_FROM_ALL)
option(OPTICK_ENABLED "Enable profiling with Optick" OFF)
set(OPTICK_USE_VULKAN ${DAWN_ENABLE_VULKAN} CACHE BOOL "Built-in support for Vulkan" FORCE)
set(OPTICK_INSTALL_TARGETS OFF CACHE BOOL "Should optick be installed? Set to OFF if you use add_subdirectory to include Optick." FORCE)
add_subdirectory(optick)
if (NOT MSVC)
target_compile_options(OptickCore PRIVATE -Wno-implicit-fallthrough)
endif ()
#option(OPTICK_ENABLED "Enable profiling with Optick" OFF)
#set(OPTICK_USE_VULKAN ${DAWN_ENABLE_VULKAN} CACHE BOOL "Built-in support for Vulkan" FORCE)
#set(OPTICK_INSTALL_TARGETS OFF CACHE BOOL "Should optick be installed? Set to OFF if you use add_subdirectory to include Optick." FORCE)
#add_subdirectory(optick)
#if (NOT MSVC)
# target_compile_options(OptickCore PRIVATE -Wno-implicit-fallthrough)
#endif ()
add_subdirectory(libjpeg-turbo EXCLUDE_FROM_ALL)
add_subdirectory(zeus EXCLUDE_FROM_ALL)

2
extern/aurora vendored

@ -1 +1 @@
Subproject commit 357ecba0ae00246332447823fddd83b8da89357f
Subproject commit e28dbaa569027d8acc63f94125c8ff7caea06f0c