griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Draw Manager: Fix multiple timer query issued for one pass.

Browse Source
This commit is contained in:
Clément Foucault
2017-05-06 17:00:37 +02:00
parent cbdaa47abb
commit 29c5692eba
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/draw/intern/draw_manager.c
View File

@@ -1512,8 +1512,6 @@ void DRW_draw_pass(DRWPass *pass)
DRW_state_set(pass->state);
BLI_listbase_clear(&DST.bound_texs);
pass->wasdrawn = true;
/* Init Timer queries */
if (pass->timer_queries[0] == 0) {
pass->front_idx = 0;
@@ -1532,8 +1530,10 @@ void DRW_draw_pass(DRWPass *pass)
pass->front_idx = tmp;
}
/* issue query for the next frame */
glBeginQuery(GL_TIME_ELAPSED, pass->timer_queries[pass->back_idx]);
if (!pass->wasdrawn) {
/* issue query for the next frame */
glBeginQuery(GL_TIME_ELAPSED, pass->timer_queries[pass->back_idx]);
}
for (DRWShadingGroup *shgroup = pass->shgroups.first; shgroup; shgroup = shgroup->next) {
draw_shgroup(shgroup, pass->state);
@@ -1551,7 +1551,11 @@ void DRW_draw_pass(DRWPass *pass)
DST.shader = NULL;
}
glEndQuery(GL_TIME_ELAPSED);
if (!pass->wasdrawn) {
glEndQuery(GL_TIME_ELAPSED);
}
pass->wasdrawn = true;
}
void DRW_draw_callbacks_pre_scene(void)