Integrating github/staging through commit ab87ed9

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
@@ -546,7 +546,6 @@ void CPlanningTextureStreamer::Job_Sort()
CTexture** pTextures = &(*sortState.pTextures)[0];
size_t nTextures = sortState.nTextures;
int nOnScreenFrameId = sortState.nFrameId - 8;
int nMinMip = sortState.fpMinMip >> 8;
size_t const nStreamLimit = sortState.nStreamLimit;
@@ -617,7 +616,6 @@ void CPlanningTextureStreamer::Job_CommitKeys(CTexture** pTextures, SPlanningTex
void CPlanningTextureStreamer::Job_CheckEnqueueForStreaming(CTexture* pTexture, const float fMipFactor, bool bHighPriority)
{
STexStreamingInfo* pStrmInfo = pTexture->m_pFileTexMips;
// calculate the new lod value
int fpMipIdSigned = pTexture->StreamCalculateMipsSignedFP(fMipFactor);