ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gl: Fix occlusion statistics clearing

This commit is contained in:
kd-11 2017-08-07 15:58:26 +03:00
parent ce437eb8d2
commit e5e6af41a6
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View File

@ -532,6 +532,10 @@ void GLGSRender::end()
m_draw_calls++; m_draw_calls++;
if (zcull_task_queue.active_query &&
zcull_task_queue.active_query->active)
zcull_task_queue.active_query->num_draws++;
synchronize_buffers(); synchronize_buffers();
rsx::thread::end(); rsx::thread::end();
@ -1234,6 +1238,7 @@ void GLGSRender::check_zcull_status(bool framebuffer_swap, bool force_read)
glBeginQuery(GL_ANY_SAMPLES_PASSED, query->handle); glBeginQuery(GL_ANY_SAMPLES_PASSED, query->handle);
query->active = true; query->active = true;
query->result = 0; query->result = 0;
query->num_draws = 0;
} }
} }
} }
@ -1243,10 +1248,15 @@ void GLGSRender::clear_zcull_stats(u32 type)
if (type == CELL_GCM_ZPASS_PIXEL_CNT) if (type == CELL_GCM_ZPASS_PIXEL_CNT)
{ {
if (zcull_task_queue.active_query && if (zcull_task_queue.active_query &&
zcull_task_queue.active_query->active) zcull_task_queue.active_query->active &&
zcull_task_queue.active_query->num_draws > 0)
{ {
//discard active query if any //discard active query results
check_zcull_status(false, true); check_zcull_status(false, true);
zcull_task_queue.active_query->pending = false;
//re-enable cull stats if stats are enabled
check_zcull_status(false, false);
} }
current_zcull_stats.clear(); current_zcull_stats.clear();

1
rpcs3/Emu/RSX/GL/GLGSRender.h
View File

@ -108,6 +108,7 @@ private:
{ {
GLuint handle; GLuint handle;
GLint result; GLint result;
GLint num_draws;
bool pending; bool pending;
bool active; bool active;
}; };