GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tracy_v09' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-tracy_v09

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-08 11:56:15 +02:00
parent 0a5d37fd9b 9560bbe23e
commit 31a000b2b6
47 changed files with 7540 additions and 3598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Engine/EngineService.cpp
View File

@@ -4,7 +4,7 @@
#include "Engine/Core/Log.h"
#include "Engine/Core/Collections/Array.h"
#include "Engine/Core/Collections/Sorting.h"
#include <ThirdParty/tracy/Tracy.h>
#include <ThirdParty/tracy/tracy/Tracy.hpp>
static bool CompareEngineServices(EngineService* const& a, EngineService* const& b)
{

2
Source/Engine/Platform/Base/ThreadBase.cpp
View File

@@ -7,7 +7,7 @@
#include "Engine/Scripting/ManagedCLR/MCore.h"
#if TRACY_ENABLE
#include "Engine/Core/Math/Math.h"
#include <ThirdParty/tracy/Tracy.h>
#include <ThirdParty/tracy/tracy/Tracy.hpp>
#endif
Delegate<Thread*> ThreadBase::ThreadStarting;

2
Source/Engine/Profiler/ProfilerCPU.h
View File

@@ -8,7 +8,7 @@
#include "Engine/Core/Math/Math.h"
#include "Engine/Core/Collections/Array.h"
#include "Engine/Scripting/ScriptingType.h"
#include <ThirdParty/tracy/Tracy.h>
#include <ThirdParty/tracy/tracy/Tracy.hpp>
#if COMPILE_WITH_PROFILER

2
Source/Engine/Scripting/Plugins/PluginManager.cpp
View File

@@ -127,7 +127,7 @@ void PluginManagerService::InvokeDeinitialize(Plugin* plugin)
return;
StringAnsiView typeName = plugin->GetType().GetName();
PROFILE_CPU();
ZoneName(typeName.Get(), typeName.Length())
ZoneName(typeName.Get(), typeName.Length());
LOG(Info, "Unloading plugin {}", plugin->ToString());