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

Red code legacy renderer (#383)

Browse Source 
- Remove some references to gEnv->pRenderer/GetIEditor()->GetRenderer() that is now always null.
- Restore the debug console to existence.
- Stop building the following in preparation for their removal:

Code/CryEngine/Cry3DEngine/*
Code/CryEngine/RenderDll/*
Code/Tools/CryFXC/*
Code/Tools/HLSLCrossCompiler/*
Code/Tools/HLSLCrossCompilerMETAL/*
Code/Tools/RC/*
Code/Tools/ShaderCacheGen/*
Tools/CrySCompileServer/*
This commit is contained in:
bosnichd
2021-04-30 07:31:42 -06:00
committed by GitHub
parent aa5ddbf532
commit 1d4c483e73
39 changed files with 1826 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp
+1 -49
View File
@@ -54,8 +54,7 @@ namespace AssetMemoryAnalyzer
namespace AssetMemoryAnalyzer
{
class AnalyzerImpl :
public AZ::Debug::MemoryDrillerBus::Handler,
public Render::Debug::VRAMDrillerBus::Handler
public AZ::Debug::MemoryDrillerBus::Handler
{
public:
AZ_TYPE_INFO(AnalyzerImpl, "{E460E4DE-2160-4171-A4B6-3C2DB6692C32}");
@@ -73,13 +72,6 @@ namespace AssetMemoryAnalyzer
void ReallocateAllocation(AZ::IAllocator* allocator, void* prevAddress, void* newAddress, size_t newByteSize, size_t newAlignment) override;
void ResizeAllocation(AZ::IAllocator* allocator, void* address, size_t newSize) override;
// VRAMDrillerBus
void RegisterCategory(Render::Debug::VRAMAllocationCategory category, const char* categoryName, const Render::Debug::VRAMSubCategoryType& subcategories) override;
void UnregisterAllCategories() override;
void RegisterAllocation(void* address, size_t byteSize, const char* allocationName, Render::Debug::VRAMAllocationCategory category, Render::Debug::VRAMAllocationSubcategory subcategories) override;
void UnregisterAllocation(void* address) override;
void GetCurrentVRAMStats(Render::Debug::VRAMAllocationCategory category, Render::Debug::VRAMAllocationSubcategory subcategory, AZStd::string& categoryName, AZStd::string& subcategoryName, size_t& numberBytesAllocated, size_t& numberAllocations) override;
AZStd::shared_ptr<FrameAnalysis> GetAnalysis();
private:
@@ -112,13 +104,11 @@ namespace AssetMemoryAnalyzer
m_assetTracking(&m_assetTree, &m_allocationTable)
{
AZ::Debug::MemoryDrillerBus::Handler::BusConnect();
Render::Debug::VRAMDrillerBus::Handler::BusConnect();
}
AnalyzerImpl::~AnalyzerImpl()
{
AZ::Debug::MemoryDrillerBus::Handler::BusDisconnect();
Render::Debug::VRAMDrillerBus::Handler::BusDisconnect();
}
void AnalyzerImpl::RegisterAllocator(AZ::IAllocator* allocator)
@@ -181,44 +171,6 @@ namespace AssetMemoryAnalyzer
m_allocationTable.ResizeAllocation(address, newSize);
}
void AnalyzerImpl::RegisterCategory(Render::Debug::VRAMAllocationCategory category, const char* categoryName, const Render::Debug::VRAMSubCategoryType& subcategories)
{
AZ_UNUSED(category);
AZ_UNUSED(categoryName);
AZ_UNUSED(subcategories);
}
void AnalyzerImpl::UnregisterAllCategories()
{
}
void AnalyzerImpl::RegisterAllocation(void* address, size_t byteSize, const char* allocationName, Render::Debug::VRAMAllocationCategory category, Render::Debug::VRAMAllocationSubcategory subcategories)
{
// Bit-flip address so that it won't collide with heap allocations (calls to the VRAM driller tend to use the same pointers from the heap objects that own the VRAM)
address = (void*)~(size_t)address;
Data::AllocationData::CategoryInfo categoryInfo;
categoryInfo.m_vramInfo.m_category = category;
categoryInfo.m_vramInfo.m_subcategories = subcategories;
RegisterAllocationCommon(address, byteSize, allocationName, 0, categoryInfo, Data::AllocationCategories::VRAM);
}
void AnalyzerImpl::UnregisterAllocation(void* address)
{
address = (void*)~(size_t)address;
UnregisterAllocationCommon(address);
}
void AnalyzerImpl::GetCurrentVRAMStats(Render::Debug::VRAMAllocationCategory category, Render::Debug::VRAMAllocationSubcategory subcategory, AZStd::string& categoryName, AZStd::string& subcategoryName, size_t& numberBytesAllocated, size_t& numberAllocations)
{
AZ_UNUSED(category);
AZ_UNUSED(subcategory);
AZ_UNUSED(categoryName);
AZ_UNUSED(subcategoryName);
AZ_UNUSED(numberBytesAllocated);
AZ_UNUSED(numberAllocations);
}
void AnalyzerImpl::RegisterAllocationCommon(void* address, size_t byteSize, const char* fileName, int lineNum, Data::AllocationData::CategoryInfo categoryInfo, Data::AllocationCategories category)
{
if (m_performingAnalysis)