From 53ce643e520de193c085c0c23046dcbd2e5308a5 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Fri, 6 Jan 2017 10:15:44 -0300 Subject: -Changed memory functions, Memory::alloc_static*, simplified them, made them aligned to 16 -Changed Vector<> template to fit this. --- main/performance.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/performance.cpp') 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(); -- cgit v1.2.3