birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/FixedTrackViewNodeCrash

Browse Source
This commit is contained in:
Chris Galvan
2021-08-25 12:05:09 -05:00
parent 306a7a622d e091450e80
commit d64c034fee
513 changed files with 13024 additions and 58469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Legacy/CryCommon/FrameProfiler.h
-67
View File
@@ -1,67 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#include <AzCore/Debug/Profiler.h>
#define SUBSYSTEM_DEFINES \
X(PROFILE_ANY, "Any") \
X(PROFILE_RENDERER, "Renderer") \
X(PROFILE_3DENGINE, "3DEngine") \
X(PROFILE_PARTICLE, "Particle") \
X(PROFILE_AI, "AI") \
X(PROFILE_ANIMATION, "Animation") \
X(PROFILE_MOVIE, "Movie") \
X(PROFILE_ENTITY, "Entity") \
X(PROFILE_UI, "UI") \
X(PROFILE_NETWORK, "Network") \
X(PROFILE_PHYSICS, "Physics") \
X(PROFILE_SCRIPT, "Script") \
X(PROFILE_SCRIPT_CFUNC, "Script C Functions") \
X(PROFILE_AUDIO, "Audio") \
X(PROFILE_EDITOR, "Editor") \
X(PROFILE_SYSTEM, "System") \
X(PROFILE_ACTION, "Action") \
X(PROFILE_GAME, "Game") \
X(PROFILE_INPUT, "Input") \
X(PROFILE_SYNC, "Sync") \
X(PROFILE_NETWORK_TRAFFIC, "Network Traffic") \
X(PROFILE_DEVICE, "Device")
#define X(Subsystem, SubsystemName) Subsystem,
enum EProfiledSubsystem
{
SUBSYSTEM_DEFINES
PROFILE_LAST_SUBSYSTEM
};
#undef X
#include <AzCore/Debug/EventTrace.h>
#define FUNCTION_PROFILER_LEGACYONLY(pISystem, subsystem)
#define FUNCTION_PROFILER(pISystem, subsystem)
#define FUNCTION_PROFILER_FAST(pISystem, subsystem, bProfileEnabled)
#define FUNCTION_PROFILER_ALWAYS(pISystem, subsystem)
#define FRAME_PROFILER_LEGACYONLY(szProfilerName, pISystem, subsystem)
#define FRAME_PROFILER(szProfilerName, pISystem, subsystem)
#define FRAME_PROFILER_FAST(szProfilerName, pISystem, subsystem, bProfileEnabled)
#define FUNCTION_PROFILER_SYS(subsystem)
#define STALL_PROFILER(cause)
Code/Legacy/CryCommon/ISystem.h
-7
View File
@@ -1654,11 +1654,4 @@ inline void CryLogAlways(const char* format, ...)
}
#endif // EXCLUDE_NORMAL_LOG
//////////////////////////////////////////////////////////////////////////
// Additional headers.
//////////////////////////////////////////////////////////////////////////
#include <FrameProfiler.h>
#endif // CRYINCLUDE_CRYCOMMON_ISYSTEM_H
Code/Legacy/CryCommon/crycommon_files.cmake
-1
View File
@@ -87,7 +87,6 @@ set(FILES
CrySystemBus.h
CryTypeInfo.h
CryVersion.h
FrameProfiler.h
HeapAllocator.h
LegacyAllocator.cpp
LegacyAllocator.h
Code/Legacy/CrySystem/LocalizedStringManager.cpp
-1
View File
@@ -1899,7 +1899,6 @@ static void LogDecompTimer(__int64 nTotalTicks, __int64 nDecompTicks, __int64 nA
AZStd::string CLocalizedStringsManager::SLocalizedStringEntry::GetTranslatedText(const SLanguage* pLanguage) const
{
FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_SYSTEM, g_bProfilerEnabled);
if ((flags & IS_COMPRESSED) != 0)
{
#if defined(LOG_DECOMP_TIMES)
Code/Legacy/CrySystem/Log.cpp
-3
View File
@@ -396,7 +396,6 @@ void CLog::LogV(const ELogType type, [[maybe_unused]]int flags, const char* szFo
}
}
FUNCTION_PROFILER(GetISystem(), PROFILE_SYSTEM);
LOADING_TIME_PROFILE_SECTION(GetISystem());
bool bfile = false, bconsole = false;
@@ -1445,8 +1444,6 @@ void CLog::RemoveCallback(ILogCallback* pCallback)
//////////////////////////////////////////////////////////////////////////
void CLog::Update()
{
FUNCTION_PROFILER_FAST(m_pSystem, PROFILE_SYSTEM, g_bProfilerEnabled);
if (CryGetCurrentThreadId() == m_nMainThreadId)
{
if (!m_threadSafeMsgQueue.empty())
Code/Legacy/CrySystem/System.cpp
+3 -15
View File
@@ -22,6 +22,8 @@
#include <AzFramework/API/ApplicationAPI.h>
#include <AzFramework/API/ApplicationAPI_Platform.h>
#include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
#include <AzCore/Debug/Profiler.h>
#include <AzCore/Debug/EventTrace.h>
#include <AzCore/Debug/Trace.h>
#include <AzCore/Debug/IEventLogger.h>
#include <AzCore/Interface/Interface.h>
@@ -659,8 +661,6 @@ ISystem* CSystem::GetCrySystem()
//////////////////////////////////////////////////////////////////////////
void CSystem::SleepIfNeeded()
{
FUNCTION_PROFILER_FAST(this, PROFILE_SYSTEM, g_bProfilerEnabled);
ITimer* const pTimer = gEnv->pTimer;
static bool firstCall = true;
@@ -738,7 +738,6 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
_mm_setcsr(_mm_getcsr() & ~0x280 | (g_cvars.sys_float_exceptions > 0 ? 0 : 0x280));
#endif //WIN32
FUNCTION_PROFILER_LEGACYONLY(GetISystem(), PROFILE_SYSTEM);
AZ_TRACE_METHOD();
m_nUpdateCounter++;
@@ -832,8 +831,6 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
//limit frame rate if vsync is turned off
//for consoles this is done inside renderthread to be vsync dependent
{
FRAME_PROFILER_LEGACYONLY("FRAME_CAP", gEnv->pSystem, PROFILE_SYSTEM);
AZ_TRACE_METHOD_NAME("FrameLimiter");
static ICVar* pSysMaxFPS = NULL;
static ICVar* pVSync = NULL;
@@ -882,7 +879,6 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
//update console system
if (m_env.pConsole)
{
FRAME_PROFILER("SysUpdate:Console", this, PROFILE_SYSTEM);
m_env.pConsole->Update();
}
@@ -898,7 +894,6 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
// Run movie system pre-update
if (!bNoUpdate)
{
FRAME_PROFILER("SysUpdate:UpdateMovieSystem", this, PROFILE_SYSTEM);
UpdateMovieSystem(updateFlags, fMovieFrameTime, true);
}
@@ -914,7 +909,6 @@ bool CSystem::UpdatePostTickBus(int updateFlags, int /*nPauseMode*/)
if (!m_bNoUpdate)
{
const float fMovieFrameTime = m_Time.GetFrameTime(ITimer::ETIMER_UI);
FRAME_PROFILER("SysUpdate:UpdateMovieSystem", this, PROFILE_SYSTEM);
UpdateMovieSystem(updateFlags, fMovieFrameTime, false);
}
@@ -922,7 +916,6 @@ bool CSystem::UpdatePostTickBus(int updateFlags, int /*nPauseMode*/)
// Update sound system
if (!m_bNoUpdate)
{
FRAME_PROFILER("SysUpdate:UpdateAudioSystems", this, PROFILE_SYSTEM);
UpdateAudioSystems();
}
@@ -949,10 +942,7 @@ bool CSystem::UpdatePostTickBus(int updateFlags, int /*nPauseMode*/)
m_updateTimes.push_back(std::make_pair(cur_time, updateTime));
}
{
FRAME_PROFILER("SysUpdate - SystemEventDispatcher::Update", this, PROFILE_SYSTEM);
m_pSystemEventDispatcher->Update();
}
m_pSystemEventDispatcher->Update();
if (!gEnv->IsEditing() && m_eRuntimeState == ESYSTEM_EVENT_LEVEL_GAMEPLAY_START)
{
@@ -973,8 +963,6 @@ bool CSystem::UpdateLoadtime()
void CSystem::UpdateAudioSystems()
{
AZ_TRACE_METHOD();
FRAME_PROFILER_LEGACYONLY("SysUpdate:Audio", this, PROFILE_SYSTEM);
Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::ExternalUpdate);
}
Code/Legacy/CrySystem/SystemEventDispatcher.cpp
+1
View File
@@ -9,6 +9,7 @@
#include "CrySystem_precompiled.h"
#include "SystemEventDispatcher.h"
#include <AzCore/Debug/EventTrace.h>
CSystemEventDispatcher::CSystemEventDispatcher()
: m_listeners(0)
Code/Legacy/CrySystem/SystemInit.cpp
-44
View File
@@ -97,7 +97,6 @@
#include <CrySystemBus.h>
#include <AzCore/Jobs/JobFunction.h>
#include <AzCore/Jobs/JobManagerBus.h>
#include <AzFramework/Driller/DrillerConsoleAPI.h>
#if defined(ANDROID)
#include <AzCore/Android/Utils.h>
@@ -1696,46 +1695,6 @@ void CmdSetAwsLogLevel(IConsoleCmdArgs* pArgs)
}
}
void CmdDrillToFile(IConsoleCmdArgs* pArgs)
{
if (azstricmp(pArgs->GetArg(0), "DrillerStop") == 0)
{
EBUS_EVENT(AzFramework::DrillerConsoleCommandBus, StopDrillerSession, AZ::Crc32("DefaultDrillerSession"));
}
else
{
if (pArgs->GetArgCount() > 1)
{
AZ::Debug::DrillerManager::DrillerListType drillersToEnable;
for (int iArg = 1; iArg < pArgs->GetArgCount(); ++iArg)
{
if (azstricmp(pArgs->GetArg(iArg), "Replica") == 0)
{
drillersToEnable.push_back();
drillersToEnable.back().id = AZ::Crc32("ReplicaDriller");
}
else if (azstricmp(pArgs->GetArg(iArg), "Carrier") == 0)
{
drillersToEnable.push_back();
drillersToEnable.back().id = AZ::Crc32("CarrierDriller");
}
else
{
CryLogAlways("Driller %s not supported.", pArgs->GetArg(iArg));
}
}
EBUS_EVENT(AzFramework::DrillerConsoleCommandBus, StartDrillerSession, drillersToEnable, AZ::Crc32("DefaultDrillerSession"));
}
else
{
CryLogAlways("Syntax: DrillerStart [Driller1] [Driller2] [...]");
CryLogAlways("Supported Drillers:");
CryLogAlways(" Carrier");
CryLogAlways(" Replica");
}
}
}
//////////////////////////////////////////////////////////////////////////
void CSystem::CreateSystemVars()
{
@@ -2114,9 +2073,6 @@ void CSystem::CreateSystemVars()
// By default it is now enabled. Modify system.cfg or game.cfg to disable it
REGISTER_INT("sys_enableCanvasEditor", 1, VF_NULL, "Enables the UI Canvas Editor");
REGISTER_COMMAND_DEV_ONLY("DrillerStart", CmdDrillToFile, VF_DEV_ONLY, "Start a driller capture.");
REGISTER_COMMAND_DEV_ONLY("DrillerStop", CmdDrillToFile, VF_DEV_ONLY, "Stop a driller capture.");
REGISTER_COMMAND("sys_SetLogLevel", CmdSetAwsLogLevel, 0, "Set AWS log level [0 - 6].");
}
Code/Legacy/CrySystem/ViewSystem/ViewSystem.cpp
-2
View File
@@ -172,8 +172,6 @@ CViewSystem::~CViewSystem()
//------------------------------------------------------------------------
void CViewSystem::Update(float frameTime)
{
FUNCTION_PROFILER(GetISystem(), PROFILE_ACTION);
if (gEnv->IsDedicated())
{
return;