asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #51138 from lawnjelly/fix_profiler_delta

Browse source 
[3.4] Profiling - fix frame_time measurement
This commit is contained in:
Rémi Verschelde 2021-08-01 12:10:38 +02:00 committed by GitHub
commit 74f28ca404
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
main/main.cpp
View file

@ -2056,17 +2056,20 @@ bool Main::iteration() {
iterating++; iterating++;
// ticks may become modified later on, and we want to store the raw measured
// value for profiling.
uint64_t raw_ticks_at_start = OS::get_singleton()->get_ticks_usec();
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
uint64_t ticks = OS::get_singleton()->get_ticks_usec(); uint64_t ticks = raw_ticks_at_start;
#else #else
// we can either sync the delta from here, or later in the iteration // we can either sync the delta from here, or later in the iteration
uint64_t ticks_at_start = OS::get_singleton()->get_ticks_usec(); uint64_t ticks_difference = raw_ticks_at_start - frame_delta_sync_time;
uint64_t ticks_difference = ticks_at_start - frame_delta_sync_time;
// if we are syncing at start or if frame_delta_sync_time is being initialized // if we are syncing at start or if frame_delta_sync_time is being initialized
// or a large gap has happened between the last delta_sync_time and now // or a large gap has happened between the last delta_sync_time and now
if (!delta_sync_after_draw || (ticks_difference > 100000)) { if (!delta_sync_after_draw || (ticks_difference > 100000)) {
frame_delta_sync_time = ticks_at_start; frame_delta_sync_time = raw_ticks_at_start;
} }
uint64_t ticks = frame_delta_sync_time; uint64_t ticks = frame_delta_sync_time;
#endif #endif
@ -2165,9 +2168,10 @@ bool Main::iteration() {
} }
#endif #endif
// profiler timing information
idle_process_ticks = OS::get_singleton()->get_ticks_usec() - idle_begin; idle_process_ticks = OS::get_singleton()->get_ticks_usec() - idle_begin;
idle_process_max = MAX(idle_process_ticks, idle_process_max); idle_process_max = MAX(idle_process_ticks, idle_process_max);
uint64_t frame_time = OS::get_singleton()->get_ticks_usec() - ticks; uint64_t frame_time = OS::get_singleton()->get_ticks_usec() - raw_ticks_at_start;
for (int i = 0; i < ScriptServer::get_language_count(); i++) { for (int i = 0; i < ScriptServer::get_language_count(); i++) {
ScriptServer::get_language(i)->frame(); ScriptServer::get_language(i)->frame();