diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-05-28 08:47:09 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-28 08:47:09 -0300 |
| commit | 5bb412f389c443d7562bdd28b973936c40c7a56e (patch) | |
| tree | 25d5bc1ce9bad1fe4a0589dd547a3273f087f12e /core | |
| parent | 856d945248a8ff3518de80eba48f19d2388c06f9 (diff) | |
| download | redot-engine-5bb412f389c443d7562bdd28b973936c40c7a56e.tar.gz | |
Revert "Make the performance reporting update frequency customizable"
Diffstat (limited to 'core')
| -rw-r--r-- | core/project_settings.cpp | 1 | ||||
| -rw-r--r-- | core/script_debugger_remote.cpp | 4 | ||||
| -rw-r--r-- | core/script_language.cpp | 2 | ||||
| -rw-r--r-- | core/script_language.h | 2 |
4 files changed, 2 insertions, 7 deletions
diff --git a/core/project_settings.cpp b/core/project_settings.cpp index ef485cb3b2..ac4a4b7d15 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -1071,7 +1071,6 @@ ProjectSettings::ProjectSettings() { GLOBAL_DEF("rendering/quality/intended_usage/framebuffer_mode", 2); GLOBAL_DEF("debug/settings/profiler/max_functions", 16384); - GLOBAL_DEF("debug/settings/performance/update_frequency_msec", 250); //assigning here, because using GLOBAL_GET on every block for compressing can be slow Compression::zstd_long_distance_matching = GLOBAL_DEF("compression/formats/zstd/long_distance_matching", false); diff --git a/core/script_debugger_remote.cpp b/core/script_debugger_remote.cpp index 22e9fe31b5..0473e2cc71 100644 --- a/core/script_debugger_remote.cpp +++ b/core/script_debugger_remote.cpp @@ -880,7 +880,7 @@ void ScriptDebuggerRemote::idle_poll() { if (performance) { uint64_t pt = OS::get_singleton()->get_ticks_msec(); - if (pt - last_perf_time > update_frequency) { + if (pt - last_perf_time > 1000) { last_perf_time = pt; int max = performance->get("MONITOR_MAX"); @@ -1107,7 +1107,7 @@ ScriptDebuggerRemote::ScriptDebuggerRemote() : eh.userdata = this; add_error_handler(&eh); - profile_info.resize(CLAMP(int(GLOBAL_GET("debug/settings/profiler/max_functions")), 128, 65535)); + profile_info.resize(CLAMP(int(ProjectSettings::get_singleton()->get("debug/settings/profiler/max_functions")), 128, 65535)); profile_info_ptrs.resize(profile_info.size()); } diff --git a/core/script_language.cpp b/core/script_language.cpp index ce9b138bb2..1dab58e29e 100644 --- a/core/script_language.cpp +++ b/core/script_language.cpp @@ -29,7 +29,6 @@ /*************************************************************************/ #include "script_language.h" -#include "project_settings.h" ScriptLanguage *ScriptServer::_languages[MAX_LANGUAGES]; int ScriptServer::_language_count = 0; @@ -284,7 +283,6 @@ ScriptDebugger::ScriptDebugger() { lines_left = -1; depth = -1; break_lang = NULL; - update_frequency = GLOBAL_GET("debug/settings/performance/update_frequency_msec"); } bool PlaceHolderScriptInstance::set(const StringName &p_name, const Variant &p_value) { diff --git a/core/script_language.h b/core/script_language.h index 64c6f2eb81..b4c55cac9e 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -352,8 +352,6 @@ class ScriptDebugger { public: typedef void (*RequestSceneTreeMessageFunc)(void *); - int update_frequency; - struct LiveEditFuncs { void *udata; |