diff --git a/Assets/Engine/Config/performance.cfg b/Assets/Engine/Config/performance.cfg deleted file mode 100644 index 153209c20d..0000000000 --- a/Assets/Engine/Config/performance.cfg +++ /dev/null @@ -1,6 +0,0 @@ -e_StatoscopeScreenshotCapturePeriod = 1 - -e_StatoscopeDataGroups = Oulm -sys_pakLogInvalidFileAccess = 1 -e_StatoscopeWriteTimeout = 10 -e_StatoscopeConnectTimeout = 10 \ No newline at end of file diff --git a/Code/Framework/AzCore/AzCore/Debug/Trace.h b/Code/Framework/AzCore/AzCore/Debug/Trace.h index bae074281c..e2727a407a 100644 --- a/Code/Framework/AzCore/AzCore/Debug/Trace.h +++ b/Code/Framework/AzCore/AzCore/Debug/Trace.h @@ -276,7 +276,7 @@ namespace AZ #define AZ_Printf(window, ...) AZ::Debug::Trace::Instance().Printf(window, __VA_ARGS__); -#if !defined(RELEASE) || defined(PERFORMANCE_BUILD) +#if !defined(RELEASE) // Unconditional critical error log, enabled up to Performance config #define AZ_Fatal(window, format, ...) AZ::Debug::Trace::Instance().Printf(window, "[FATAL] " format "\n", ##__VA_ARGS__); #define AZ_Crash() AZ::Debug::Trace::Instance().Crash(); diff --git a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h index f02c37492b..fe586ce078 100644 --- a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h +++ b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h @@ -1290,13 +1290,13 @@ namespace AZ const EventArray& GetEvents() const; -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) // m_scriptPath is only available in non-Release mode +#if !defined(_RELEASE) // m_scriptPath is only available in non-Release mode AZStd::string m_scriptPath; #endif AZStd::string GetScriptPath() const { -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) // m_scriptPath is only available in non-Release mode +#if !defined(_RELEASE) // m_scriptPath is only available in non-Release mode return m_scriptPath; #else return{}; @@ -1305,7 +1305,7 @@ namespace AZ void SetScriptPath(const char* scriptPath) { -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) // m_scriptPath is only available in non-Release mode +#if !defined(_RELEASE) // m_scriptPath is only available in non-Release mode m_scriptPath = scriptPath; #else AZ_UNUSED(scriptPath); diff --git a/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp index 531c91bcf4..7cfc57cb7e 100644 --- a/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp +++ b/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp @@ -3727,7 +3727,7 @@ LUA_API const Node* lua_getDummyNode() if (m_handler) { -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) +#if !defined(_RELEASE) const AZStd::string_view luaString("Lua"); lua_Debug info; for (int level = 0; lua_getstack(m_lua, level, &info); ++level) @@ -3739,7 +3739,7 @@ LUA_API const Node* lua_getDummyNode() break; } } -#endif//defined(PERFORMANCE_BUILD) || !defined(_RELEASE) +#endif BindEvents(scriptTable); diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp index 3411c06f28..9b1946701c 100644 --- a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp +++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp @@ -987,7 +987,7 @@ namespace AzFramework void AssetCatalog::AddCatalogEntry(AZStd::shared_ptr deltaCatalog) { AZStd::lock_guard lock(m_deltaCatalogMutex); -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) +#if !defined(_RELEASE) for (const auto& thisElement : m_deltaCatalogList) { if (thisElement == deltaCatalog) @@ -1010,7 +1010,7 @@ namespace AzFramework AZ_Warning("AssetCatalog", false, "Catalog name %p can't be inserted at slot %u", deltaCatalog.get(), catalogIndex); return; } -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) +#if !defined(_RELEASE) for (const auto& thisElement : m_deltaCatalogList) { if (thisElement == deltaCatalog) diff --git a/Code/Legacy/CryCommon/ProjectDefines.h b/Code/Legacy/CryCommon/ProjectDefines.h index f7f73f111b..b443fc9ce0 100644 --- a/Code/Legacy/CryCommon/ProjectDefines.h +++ b/Code/Legacy/CryCommon/ProjectDefines.h @@ -27,7 +27,7 @@ #define AZ_RESTRICTED_SECTION PROJECTDEFINES_H_SECTION_STATS_AGENT #include AZ_RESTRICTED_FILE(ProjectDefines_h) #elif defined(WIN32) || defined(WIN64) - #if !defined(_RELEASE) || defined(PERFORMANCE_BUILD) + #if !defined(_RELEASE) #define ENABLE_STATS_AGENT #endif #endif @@ -71,7 +71,7 @@ #define REMOTE_ASSET_PROCESSOR #endif -#if (!defined(_RELEASE) || defined(PERFORMANCE_BUILD)) +#if (!defined(_RELEASE) #define USE_HTTP_WEBSOCKETS 0 #endif @@ -97,7 +97,7 @@ #endif #endif -#if (!defined(_RELEASE) || defined(PERFORMANCE_BUILD)) +#if (!defined(_RELEASE) #ifndef ENABLE_PROFILING_CODE #define ENABLE_PROFILING_CODE #endif diff --git a/Code/Legacy/CrySystem/SystemInit.cpp b/Code/Legacy/CrySystem/SystemInit.cpp index d5efff2748..a335dae112 100644 --- a/Code/Legacy/CrySystem/SystemInit.cpp +++ b/Code/Legacy/CrySystem/SystemInit.cpp @@ -1433,10 +1433,6 @@ AZ_POP_DISABLE_WARNING #endif } -#if defined(PERFORMANCE_BUILD) - LoadConfiguration("performance.cfg"); -#endif - ////////////////////////////////////////////////////////////////////////// if (g_cvars.sys_asserts == 0) { diff --git a/Code/Legacy/CrySystem/XConsole.cpp b/Code/Legacy/CrySystem/XConsole.cpp index bb8316981a..1cc9696a06 100644 --- a/Code/Legacy/CrySystem/XConsole.cpp +++ b/Code/Legacy/CrySystem/XConsole.cpp @@ -297,7 +297,7 @@ void CXConsole::Init(ISystem* pSystem) AzFramework::InputChannelEventListener::Connect(); AzFramework::InputTextEventListener::Connect(); -#if defined(_RELEASE) && !defined(PERFORMANCE_BUILD) +#if defined(_RELEASE) static const int kDeactivateConsoleDefault = 1; #else static const int kDeactivateConsoleDefault = 0; diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp index 02c776293d..d7e4bd2556 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp @@ -8,6 +8,7 @@ #include #include #include +#include namespace AZ { diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h index 37a78a88f4..ebe591e15f 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h @@ -15,7 +15,7 @@ #include -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) +#if !defined(_RELEASE) // the markers are defined in test, but the system that listens for calls won't always be enabled #define SCRIPT_CANVAS_PERFORMANCE_TRACKING_ENABLED #endif diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp index d7a4c360ac..e93fd1263d 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp @@ -465,12 +465,7 @@ namespace ScriptCanvas lua_register(lua, k_UnpackDependencyConstructionArgsFunctionName, &UnpackDependencyConstructionArgs); lua_register(lua, k_UnpackDependencyConstructionArgsLeafFunctionName, &UnpackDependencyConstructionArgsLeaf); -#if defined(PERFORMANCE_BUILD) - lua_pushboolean(lua, true); - lua_setglobal(lua, k_InterpretedConfigurationPerformance); - lua_pushboolean(lua, false); - lua_setglobal(lua, k_InterpretedConfigurationRelease); -#elif defined(_RELEASE) +#if defined(_RELEASE) lua_pushboolean(lua, false); lua_setglobal(lua, k_InterpretedConfigurationPerformance); lua_pushboolean(lua, true); @@ -481,7 +476,7 @@ namespace ScriptCanvas lua_setglobal(lua, k_InterpretedConfigurationPerformance); lua_pushboolean(lua, false); lua_setglobal(lua, k_InterpretedConfigurationRelease); -#endif//defined(PERFORMANCE_BUILD) +#endif lua_register(lua, k_GetRandomSwitchControlNumberName, &GetRandomSwitchControlNumber); diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp index 6d652136cd..c1b0d51ac8 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp @@ -19,7 +19,7 @@ #include #include -#if !defined(_RELEASE) && !defined(PERFORMANCE_BUILD) +#if !defined(_RELEASE) #define SCRIPT_CANVAS_RUNTIME_ASSET_CHECK #endif diff --git a/Gems/ScriptCanvas/Code/Source/SystemComponent.cpp b/Gems/ScriptCanvas/Code/Source/SystemComponent.cpp index ba02fa8a62..5d6b98f7cb 100644 --- a/Gems/ScriptCanvas/Code/Source/SystemComponent.cpp +++ b/Gems/ScriptCanvas/Code/Source/SystemComponent.cpp @@ -34,7 +34,7 @@ namespace ScriptCanvasSystemComponentCpp { -#if !defined(_RELEASE) && !defined(PERFORMANCE_BUILD) +#if !defined(_RELEASE) const int k_infiniteLoopDetectionMaxIterations = 1000000; const int k_maxHandlerStackDepth = 25; #else