kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented logic to throttle streaming after low memory warnings occur

Browse Source
This commit is contained in:
Kearwood Gilbert
2014-06-01 18:08:28 -07:00
parent 6bf013fc87
commit 9501c29ec5
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
KREngine/kraken/KRContext.cpp
View File

@@ -32,6 +32,7 @@ KRContext::KRContext() : m_streamer(*this)
m_bDetectedExtensions = false; m_bDetectedExtensions = false;
m_current_frame = 0; m_current_frame = 0;
m_last_memory_warning_frame = 0;
m_absolute_time = 0.0f; m_absolute_time = 0.0f;
m_pBundleManager = new KRBundleManager(*this); m_pBundleManager = new KRBundleManager(*this);
@@ -331,9 +332,21 @@ void KRContext::getMemoryStats(long &free_memory)
void KRContext::doStreaming() void KRContext::doStreaming()
{ {
if(m_streamingEnabled) { if(m_streamingEnabled) {
const long MEMORY_WARNING_THROTTLE_FRAMES = 15;
bool memory_warning_throttle = m_last_memory_warning_frame != 0 && m_current_frame - m_last_memory_warning_frame < MEMORY_WARNING_THROTTLE_FRAMES;
long memoryRemaining = KRENGINE_GPU_MEM_TARGET; long memoryRemaining = KRENGINE_GPU_MEM_TARGET;
long memoryRemainingThisFrame = KRENGINE_GPU_MEM_MAX - m_pTextureManager->getMemUsed() - m_pMeshManager->getMemUsed(); long memoryRemainingThisFrame = KRENGINE_GPU_MEM_MAX - m_pTextureManager->getMemUsed() - m_pMeshManager->getMemUsed();
m_pMeshManager->doStreaming(memoryRemaining, memoryRemainingThisFrame);
m_pTextureManager->doStreaming(memoryRemaining, memoryRemainingThisFrame); if(!memory_warning_throttle) {
m_pMeshManager->doStreaming(memoryRemaining, memoryRemainingThisFrame);
m_pTextureManager->doStreaming(memoryRemaining, memoryRemainingThisFrame);
}
} }
} }
void KRContext::receivedMemoryWarning()
{
m_last_memory_warning_frame = m_current_frame;
}

2
KREngine/kraken/KRContext.h
View File

@@ -85,6 +85,7 @@ public:
static void Log(log_level level, const std::string &message_format, ...); static void Log(log_level level, const std::string &message_format, ...);
void doStreaming(); void doStreaming();
void receivedMemoryWarning();
private: private:
KRBundleManager *m_pBundleManager; KRBundleManager *m_pBundleManager;
@@ -102,6 +103,7 @@ private:
bool m_bDetectedExtensions; bool m_bDetectedExtensions;
long m_current_frame; long m_current_frame;
long m_last_memory_warning_frame;
float m_absolute_time; float m_absolute_time;
mach_timebase_info_data_t m_timebase_info; mach_timebase_info_data_t m_timebase_info;