Remove legacy serialization and QPropertyTree (#684)
Remove: - CryCommon/CryExtension/* - CryCommon/Serialization/* - Sandbox/Plugins/EditorCommon/QPropertyTree/* - All related CryCommon interfaces - All CrySystem implementations - Various related Editor classes
This commit is contained in:
@@ -1757,16 +1757,9 @@ namespace Audio
|
||||
memoryInfo.nPrimaryPoolSize = AZ::AllocatorInstance<Audio::AudioImplAllocator>::Get().Capacity();
|
||||
memoryInfo.nPrimaryPoolUsedSize = memoryInfo.nPrimaryPoolSize - AZ::AllocatorInstance<Audio::AudioImplAllocator>::Get().GetUnAllocatedMemory();
|
||||
memoryInfo.nPrimaryPoolAllocations = 0;
|
||||
|
||||
#if AZ_TRAIT_AUDIOENGINEWWISE_PROVIDE_IMPL_SECONDARY_POOL
|
||||
memoryInfo.nSecondaryPoolSize = g_audioImplMemoryPoolSecondary_wwise.MemSize();
|
||||
memoryInfo.nSecondaryPoolUsedSize = memoryInfo.nSecondaryPoolSize - g_audioImplMemoryPoolSecondary_wwise.MemFree();
|
||||
memoryInfo.nSecondaryPoolAllocations = g_audioImplMemoryPoolSecondary_wwise.FragmentCount();
|
||||
#else
|
||||
memoryInfo.nSecondaryPoolSize = 0;
|
||||
memoryInfo.nSecondaryPoolUsedSize = 0;
|
||||
memoryInfo.nSecondaryPoolAllocations = 0;
|
||||
#endif // AZ_TRAIT_AUDIOENGINEWWISE_PROVIDE_IMPL_SECONDARY_POOL
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -19,20 +19,6 @@
|
||||
#include <IAudioSystem.h>
|
||||
#include <AudioEngineWwise_Traits_Platform.h>
|
||||
|
||||
|
||||
#if AZ_TRAIT_AUDIOENGINEWWISE_PROVIDE_IMPL_SECONDARY_POOL
|
||||
#include <platform.h>
|
||||
#include <CryPool/PoolAlloc.h>
|
||||
|
||||
using TMemoryPoolReferenced = NCryPoolAlloc::CThreadSafe<NCryPoolAlloc::CBestFit<NCryPoolAlloc::CReferenced<NCryPoolAlloc::CMemoryDynamic, 4 * 1024, true>, NCryPoolAlloc::CListItemReference>>;
|
||||
|
||||
namespace Audio
|
||||
{
|
||||
extern TMemoryPoolReferenced g_audioImplMemoryPoolSecondary_wwise;
|
||||
}
|
||||
#endif // AZ_TRAIT_AUDIOENGINEWWISE_PROVIDE_IMPL_SECONDARY_POOL
|
||||
|
||||
|
||||
#define WWISE_IMPL_VERSION_STRING "Wwise " AK_WWISESDK_VERSIONNAME
|
||||
|
||||
#define ASSERT_WWISE_OK(x) (AKASSERT((x) == AK_Success))
|
||||
|
||||
Reference in New Issue
Block a user