diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-12-22 13:26:59 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-12-22 13:26:59 +0400 |
commit | ff9974ed69bf2b71a569191cc06ae909217ffd2c (patch) | |
tree | d127d2161a4e71edd6a29ae9ade7a34c10608a51 /intern/memutil/MEM_CacheLimiter.h | |
parent | 78698a2ecf9d17340ce337ecf73ce6e355299f89 (diff) |
Fix T37898: blenderplayer painfully slow in recent builds
Issue was caused by recent image cache rewrite and root of
the issue goes to the fact that blender player doesn't
initialize cache limiter and it uses 32meg of memory only.
This leads to infinite image loading/freeing.
For now disabled cache limiter in game engine, this brings
back old behavior.
In theory we might be smarter here, but better caching
policy is to be discussed.
Diffstat (limited to 'intern/memutil/MEM_CacheLimiter.h')
-rw-r--r-- | intern/memutil/MEM_CacheLimiter.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/intern/memutil/MEM_CacheLimiter.h b/intern/memutil/MEM_CacheLimiter.h index 88e06833b4a..bbe6ace2456 100644 --- a/intern/memutil/MEM_CacheLimiter.h +++ b/intern/memutil/MEM_CacheLimiter.h @@ -69,6 +69,8 @@ class MEM_CacheLimiter; extern "C" { void MEM_CacheLimiter_set_maximum(size_t m); size_t MEM_CacheLimiter_get_maximum(); + void MEM_CacheLimiter_set_disabled(bool disabled); + bool MEM_CacheLimiter_is_disabled(void); }; #endif @@ -177,8 +179,13 @@ public: void enforce_limits() { size_t max = MEM_CacheLimiter_get_maximum(); + bool is_disabled = MEM_CacheLimiter_is_disabled(); size_t mem_in_use, cur_size; + if (is_disabled) { + return; + } + if (max == 0) { return; } |