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
2021-08-25 11:47:19 -07:00
parent cd5df6b372 b53182fdb6
commit 6b96be82ea
400 changed files with 1886 additions and 46899 deletions
@@ -13,6 +13,7 @@
    #include <AzCore/Math/Color.h>
 #endif // !AUDIO_RELEASE

+#include <AzCore/Debug/Profiler.h>
 #include <AzCore/StringFunc/StringFunc.h>

 #include <SoundCVars.h>
@@ -17,7 +17,6 @@
 #include <AzCore/std/bind/bind.h>
 #include <AzCore/StringFunc/StringFunc.h>

-
 namespace Audio
 {
    extern CAudioLogger g_audioLogger;
@@ -13,6 +13,7 @@
 #include <AudioAllocators.h>
 #include <AudioInternalInterfaces.h>

+#include <AzCore/Debug/Budget.h>
 #include <AzCore/std/containers/deque.h>
 #include <AzCore/std/containers/vector.h>

@@ -22,6 +23,8 @@

 #define PROVIDE_GETNAME_SUPPORT

+AZ_DECLARE_BUDGET(Audio);
+
 namespace Audio
 {
    // Forward declarations.