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/Cry3DEngine/GeomCacheManager.cpp
-5
View File
@@ -855,7 +855,6 @@ void CGeomCacheManager::LaunchDecompressJobs(SGeomCacheStreamInfo* pStreamInfo,
assert(gEnv->mMainThreadId == CryGetCurrentThreadId());
const CGeomCacheRenderNode* pRenderNode = pStreamInfo->m_pRenderNode;
const CGeomCache* pGeomCache = pStreamInfo->m_pGeomCache;
const GeomCacheFile::EBlockCompressionFormat blockCompressionFormat = pGeomCache->GetBlockCompressionFormat();
const float currentCacheStreamingTime = pStreamInfo->m_pRenderNode->GetStreamingTime();
@@ -1009,7 +1008,6 @@ void CGeomCacheManager::DecompressFrame_JobEntry(SGeomCacheStreamInfo* pStreamIn
{
FUNCTION_PROFILER_3DENGINE;
const CGeomCacheRenderNode* pRenderNode = pStreamInfo->m_pRenderNode;
const CGeomCache* pGeomCache = pStreamInfo->m_pGeomCache;
const uint frameIndex = pDecompressHandle->m_startFrame + blockIndex;
@@ -1379,7 +1377,6 @@ void CGeomCacheManager::RetireHandles(SGeomCacheStreamInfo& streamInfo)
{
FUNCTION_PROFILER_3DENGINE;
CGeomCacheRenderNode* pRenderNode = streamInfo.m_pRenderNode;
const CGeomCache* pGeomCache = streamInfo.m_pGeomCache;
const float currentCacheStreamingTime = streamInfo.m_pRenderNode->GetStreamingTime();
const uint wantedFloorFrame = pGeomCache->GetFloorFrameIndex(currentCacheStreamingTime);
@@ -1712,7 +1709,6 @@ void CGeomCacheManager::DrawDebugInfo()
const float streamInfoBoxSize = 10.0f;
uint numActiveStreams = 0;
uint numFramesMissed = 0;
const uint kNumColors = 8;
ColorF colors[kNumColors] = { Col_Red, Col_Green, Col_Yellow, Col_Blue, Col_Aquamarine, Col_Thistle, Col_Tan, Col_Salmon };
@@ -1725,7 +1721,6 @@ void CGeomCacheManager::DrawDebugInfo()
CGeomCacheRenderNode* pRenderNode = streamInfo.m_pRenderNode;
CGeomCache* pGeomCache = streamInfo.m_pGeomCache;
const char* pName = streamInfo.m_pRenderNode->GetName();
const char* pFilter = GetCVars()->e_GeomCacheDebugFilter->GetString();
const bool bDisplay = ((GetCVars()->e_GeomCacheDebug != 2) || (pRenderNode->IsStreaming() || streamInfo.m_pOldestDecompressHandle || streamInfo.m_pNewestReadRequestHandle))
&& strstr(pName, GetCVars()->e_GeomCacheDebugFilter->GetString()) != NULL;