diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-06 10:15:44 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-06 10:15:44 -0300 |
| commit | 53ce643e520de193c085c0c23046dcbd2e5308a5 (patch) | |
| tree | d8336629c4ce789eb441fc3bd428e317d8ad8e9c /main | |
| parent | 99ceddd11ef652a3b8e6bf5d09dcc519d957ce14 (diff) | |
-Changed memory functions, Memory::alloc_static*, simplified them, made them aligned to 16
-Changed Vector<> template to fit this.
Diffstat (limited to 'main')
| -rw-r--r-- | main/performance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/performance.cpp b/main/performance.cpp index 28b42ae689..637ff2b079 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -121,9 +121,9 @@ float Performance::get_monitor(Monitor p_monitor) const { case TIME_FPS: return OS::get_singleton()->get_frames_per_second(); case TIME_PROCESS: return _process_time; case TIME_FIXED_PROCESS: return _fixed_process_time; - case MEMORY_STATIC: return Memory::get_static_mem_usage(); + case MEMORY_STATIC: return Memory::get_mem_usage(); case MEMORY_DYNAMIC: return Memory::get_dynamic_mem_usage(); - case MEMORY_STATIC_MAX: return Memory::get_static_mem_max_usage(); + case MEMORY_STATIC_MAX: return Memory::get_mem_max_usage(); case MEMORY_DYNAMIC_MAX: return Memory::get_dynamic_mem_available(); case MEMORY_MESSAGE_BUFFER_MAX: return MessageQueue::get_singleton()->get_max_buffer_usage(); case OBJECT_COUNT: return ObjectDB::get_object_count(); |