Merge branch 'development' into cmake/linux_fix_warn_unused

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

Code/Legacy/CryCommon/FrameProfiler.h

@@ -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

@@ -1649,11 +1649,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

@@ -87,7 +87,6 @@ set(FILES
     CrySystemBus.h
     CryTypeInfo.h
     CryVersion.h
-    FrameProfiler.h
     HeapAllocator.h
     LegacyAllocator.cpp
     LegacyAllocator.h