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

Merge branch 'development' into cmake/linux_fix_warn_unused

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
This commit is contained in:
Esteban Papp
2021-08-25 11:47:19 -07:00
parent cd5df6b372 b53182fdb6
commit 6b96be82ea
400 changed files with 1886 additions and 46899 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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>
@@ -605,8 +607,6 @@ ISystem* CSystem::GetCrySystem()
//////////////////////////////////////////////////////////////////////////
void CSystem::SleepIfNeeded()
{
FUNCTION_PROFILER_FAST(this, PROFILE_SYSTEM, g_bProfilerEnabled);
ITimer* const pTimer = gEnv->pTimer;
static bool firstCall = true;
@@ -684,7 +684,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++;
@@ -778,8 +777,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;
@@ -828,7 +825,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();
}
@@ -844,7 +840,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);
}
@@ -860,7 +855,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);
}
@@ -868,7 +862,6 @@ bool CSystem::UpdatePostTickBus(int updateFlags, int /*nPauseMode*/)
// Update sound system
if (!m_bNoUpdate)
{
FRAME_PROFILER("SysUpdate:UpdateAudioSystems", this, PROFILE_SYSTEM);
UpdateAudioSystems();
}
@@ -895,10 +888,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)
{
@@ -919,8 +909,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);
}