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/RenderDll/Common/Textures/PlanningTextureStreamer.cpp
-14
View File
@@ -217,7 +217,6 @@ void CPlanningTextureStreamer::ApplySchedule(EApplyScheduleFlags asf)
ptrdiff_t nMemFreeUpper = schedule.memState.nMemFreeUpper;
ptrdiff_t nMemFreeLower = schedule.memState.nMemFreeLower;
int nBalancePoint = schedule.nBalancePoint;
int nOnScreenPoint = schedule.nOnScreenPoint;
// Everything < nBalancePoint can only be trimmed (trimmable list), everything >= nBalancePoint can be kicked
// We should be able to load everything in the requested list
@@ -381,10 +380,6 @@ bool CPlanningTextureStreamer::TryBegin_FromDisk(CTexture* pTex, uint32 nTexPers
++estp;
}
uint32 nWantedWidth = max(1, pTex->m_nWidth >> nTexWantedMip);
uint32 nWantedHeight = max(1, pTex->m_nHeight >> nTexWantedMip);
uint32 nAvailWidth = max(1, pTex->m_nWidth >> nTexAvailMip);
uint32 nAvailHeight = max(1, pTex->m_nHeight >> nTexAvailMip);
ptrdiff_t nRequired = pTex->StreamComputeDevDataSize(nTexWantedMip) - pTex->StreamComputeDevDataSize(nTexAvailMip);
@@ -486,10 +481,6 @@ bool CPlanningTextureStreamer::TryBegin_Composite(CTexture* pTex, [[maybe_unused
ptrdiff_t& nMemFreeLower, ptrdiff_t& nMemFreeUpper, int& nKickIdx,
[[maybe_unused]] int& nNumSubmittedLoad, [[maybe_unused]] size_t& nAmtSubmittedLoad)
{
uint32 nWantedWidth = max(1, pTex->m_nWidth >> nTexWantedMip);
uint32 nWantedHeight = max(1, pTex->m_nHeight >> nTexWantedMip);
uint32 nAvailWidth = max(1, pTex->m_nWidth >> nTexAvailMip);
uint32 nAvailHeight = max(1, pTex->m_nHeight >> nTexAvailMip);
ptrdiff_t nRequired = pTex->StreamComputeDevDataSize(nTexWantedMip) - pTex->StreamComputeDevDataSize(nTexAvailMip);
@@ -787,7 +778,6 @@ bool CPlanningTextureStreamer::TrimTexture(int nBias, TStreamerTextureVec& trimm
{
CTexture* pTrimTex = trimmable[i];
bool bRemove = false;
if (pTrimTex->m_bStreamPrepared)
{
@@ -881,10 +871,6 @@ ptrdiff_t CPlanningTextureStreamer::KickTextures(CTexture** pTextures, ptrdiff_t
// unload textures that are older than 4 update cycles
if (nKillPersMip > nKillMip)
{
uint32 nKillWidth = pKillTex->m_nWidth >> nKillMip;
uint32 nKillHeight = pKillTex->m_nHeight >> nKillMip;
int nKillMips = nKillPersMip - nKillMip;
ETEX_Format nKillFormat = pKillTex->m_eTFSrc;
// How much is available?
ptrdiff_t nProfit = pKillTex->StreamComputeDevDataSize(nKillMip) - pKillTex->StreamComputeDevDataSize(nKillPersMip);