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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/CryEngine/CrySystem/Statistics/LocalMemoryUsage.cpp
-4
View File
@@ -864,9 +864,6 @@ void CLocalMemoryUsage::OnRender(IRenderer* pRenderer, const CCamera* camera)
}
}
float localMemoryTextureStreamingSpeedLimit = sys_LocalMemoryTextureStreamingSpeedLimit * 1024.f * 1024.f;
float localMemoryStatObjStreamingSpeedLimit = sys_LocalMemoryGeometryStreamingSpeedLimit * 1024.f * 1024.f;
sector++;
}
}
@@ -1335,7 +1332,6 @@ void CLocalMemoryUsage::CollectMaterialInfo_Recursive(SMaterialInfo* materialInf
for (auto iter = rItem.m_pShaderResources->GetTexturesResourceMap()->begin();
iter != rItem.m_pShaderResources->GetTexturesResourceMap()->end(); ++iter)
{
uint16 texId = iter->first;
const SEfResTexture* pTextureRes = &iter->second;
if (pTextureRes->m_Sampler.m_pITex)