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

removes leftover of performance build

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-31 09:31:42 -07:00
parent 102c321e56
commit c128760ed0
13 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Engine/Config/performance.cfg
-6
View File
@@ -1,6 +0,0 @@
e_StatoscopeScreenshotCapturePeriod = 1
e_StatoscopeDataGroups = Oulm
sys_pakLogInvalidFileAccess = 1
e_StatoscopeWriteTimeout = 10
e_StatoscopeConnectTimeout = 10
Code/Framework/AzCore/AzCore/Debug/Trace.h
+1 -1
View File
@@ -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();
Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h
+3 -3
View File
@@ -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);
Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp
+2 -2
View File
@@ -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);
Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp
+2 -2
View File
@@ -987,7 +987,7 @@ namespace AzFramework
void AssetCatalog::AddCatalogEntry(AZStd::shared_ptr<AzFramework::AssetRegistry> deltaCatalog)
{
AZStd::lock_guard<AZStd::recursive_mutex> 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)
Code/Legacy/CryCommon/ProjectDefines.h
+3 -3
View File
@@ -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
Code/Legacy/CrySystem/SystemInit.cpp
-4
View File
@@ -1433,10 +1433,6 @@ AZ_POP_DISABLE_WARNING
#endif
}
#if defined(PERFORMANCE_BUILD)
LoadConfiguration("performance.cfg");
#endif
//////////////////////////////////////////////////////////////////////////
if (g_cvars.sys_asserts == 0)
{
Code/Legacy/CrySystem/XConsole.cpp
+1 -1
View File
@@ -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;
Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp
+1
View File
@@ -8,6 +8,7 @@
#include <RHI/Conversion.h>
#include <RHI/Instance.h>
#include <RHI/WSISurface.h>
#include <vulkan/vulkan.h>
namespace AZ
{
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h
+1 -1
View File
@@ -15,7 +15,7 @@
#include <ScriptCanvas/Core/Core.h>
#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
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
+2 -7
View File
@@ -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);
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include <ScriptCanvas/Execution/ExecutionContext.h>
#include <ScriptCanvas/Execution/ExecutionState.h>
#if !defined(_RELEASE) && !defined(PERFORMANCE_BUILD)
#if !defined(_RELEASE)
#define SCRIPT_CANVAS_RUNTIME_ASSET_CHECK
#endif
Gems/ScriptCanvas/Code/Source/SystemComponent.cpp
+1 -1
View File
@@ -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