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

Remove legacy serialization and QPropertyTree (#684)

Browse Source 
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:
bosnichd
2021-05-11 09:31:02 -06:00
committed by GitHub
parent a009e38064
commit 3defbce31b
338 changed files with 16 additions and 63358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseGemSystemComponent.cpp
-11
View File
@@ -36,10 +36,6 @@ namespace Audio
{
CAudioLogger g_audioImplLogger_wwise;
#if AZ_TRAIT_AUDIOENGINEWWISE_PROVIDE_IMPL_SECONDARY_POOL
TMemoryPoolReferenced g_audioImplMemoryPoolSecondary_wwise;
#endif // AZ_TRAIT_AUDIOENGINEWWISE_PROVIDE_IMPL_SECONDARY_POOL
namespace Platform
{
void* InitializeSecondaryMemoryPool(size_t& secondarySize);
@@ -154,13 +150,6 @@ namespace AudioEngineWwiseGem
m_engineWwise = AZStd::make_unique<Audio::CAudioSystemImpl_wwise>(assetPlatform.c_str());
if (m_engineWwise)
{
#if AZ_TRAIT_AUDIOENGINEWWISE_PROVIDE_IMPL_SECONDARY_POOL
size_t secondarySize = 0;
void* secondaryMemoryPtr = Audio::Platform::InitializeSecondaryMemoryPool(secondarySize);
Audio::g_audioImplMemoryPoolSecondary_wwise.InitMem(secondarySize, static_cast<uint8*>(secondaryMemoryPtr));
#endif // AZ_TRAIT_AUDIOENGINEWWISE_PROVIDE_IMPL_SECONDARY_POOL
Audio::g_audioImplLogger_wwise.Log(Audio::eALT_ALWAYS, "AudioEngineWwise created!");
Audio::SAudioRequest oAudioRequestData;
Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.h
-11
View File
@@ -35,12 +35,6 @@ namespace AudioControls
bool HasProperties() override { return true; }
void Serialize(Serialization::IArchive& ar) override
{
ar(m_mult, "mult", "Multiply");
ar(m_shift, "shift", "Shift");
}
float m_mult;
float m_shift;
};
@@ -61,11 +55,6 @@ namespace AudioControls
bool HasProperties() override { return true; }
void Serialize(Serialization::IArchive& ar) override
{
ar(m_value, "value", "Value");
}
float m_value;
};
Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.cpp
-7
View File
@@ -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
}
///////////////////////////////////////////////////////////////////////////////////////////////////
Gems/AudioEngineWwise/Code/Source/Engine/Common_wwise.h
-14
View File
@@ -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))