TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

display: Fix issues with PStats GPU timing:

Browse Source 
- Leaking queries by never reusing / releasing them
- Clock synchronization was way off when driver waited on GPU during sync point
This commit is contained in:
rdb 2022-02-22 17:00:47 +01:00
parent 284ffe9e83
commit 72c891c0df
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/display/graphicsStateGuardian.cxx
View File

@ -2363,7 +2363,10 @@ calc_projection_mat(const Lens *lens) {
*/ */
bool GraphicsStateGuardian:: bool GraphicsStateGuardian::
begin_frame(Thread *current_thread) { begin_frame(Thread *current_thread) {
_prepared_objects->begin_frame(this, current_thread); {
PStatTimer timer(_prepare_pcollector);
_prepared_objects->begin_frame(this, current_thread);
}
// We should reset the state to the default at the beginning of every frame. // We should reset the state to the default at the beginning of every frame.
// Although this will incur additional overhead, particularly in a simple // Although this will incur additional overhead, particularly in a simple

14
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -4420,6 +4420,7 @@ begin_frame_timing(int frame_number) {
} }
PStatClient *client = PStatClient::get_global_pstats(); PStatClient *client = PStatClient::get_global_pstats();
PStatTimer timer(_wait_timer_pcollector);
_timer_queries_pcollector.clear_level(); _timer_queries_pcollector.clear_level();
@ -4435,12 +4436,14 @@ begin_frame_timing(int frame_number) {
_deleted_queries.pop_back(); _deleted_queries.pop_back();
_glQueryCounter(frame_query, GL_TIMESTAMP); _glQueryCounter(frame_query, GL_TIMESTAMP);
// Synchronize the GL time with the PStats clock. // Synchronize the GL time with the PStats clock. Note that the driver may
// arbitrarily decide to wait a long time on this call if the queue is
// saturated with work. Experimentally, it seems that it queries the time
// *after* the wait, so we take the CPU time after it returns. If we find
// that some drivers do it differently, we may have to do multiple calls.
GLint64 gl_time; GLint64 gl_time;
double cpu_time1 = client->get_real_time();
_glGetInteger64v(GL_TIMESTAMP, &gl_time); _glGetInteger64v(GL_TIMESTAMP, &gl_time);
double cpu_time2 = client->get_real_time(); double cpu_time = client->get_real_time();
double cpu_time = (cpu_time1 + cpu_time2) / 2.0;
// Check if the results from the previous frame are available. We just need // Check if the results from the previous frame are available. We just need
// to check whether the last query for each frame is available. // to check whether the last query for each frame is available.
@ -4486,8 +4489,6 @@ end_frame_timing(const FrameTiming &frame) {
return; return;
} }
PStatTimer timer(_wait_timer_pcollector);
// We represent each GSG as one thread. In the future we may change this to // We represent each GSG as one thread. In the future we may change this to
// representing each graphics device as one thread, but OpenGL doesn't really // representing each graphics device as one thread, but OpenGL doesn't really
// expose this information to us. // expose this information to us.
@ -4516,6 +4517,7 @@ end_frame_timing(const FrameTiming &frame) {
frame_data.add_start(query.second & 0x7fff, time); frame_data.add_start(query.second & 0x7fff, time);
} }
} }
_deleted_queries.push_back(query.first);
} }
// The end time of the last collector is implicitly the frame's end time. // The end time of the last collector is implicitly the frame's end time.