piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for the hang after close caused by my previews perf queries commit.

Browse Source 
Sorry for that.
fix issue 6205
This commit is contained in:
Rodolfo Bogado
2013-04-04 12:53:06 -03:00
parent e11f5630b1
commit d032f3fd79
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.cpp
View File

@ -8,6 +8,16 @@ namespace DX9 {
PerfQuery::PerfQuery()
: m_query_read_pos()
, m_query_count()
{
}
PerfQuery::~PerfQuery()
{
}
void PerfQuery::CreateDeviceObjects()
{
for (int i = 0; i != ARRAYSIZE(m_query_buffer); ++i)
{
@ -15,8 +25,7 @@ PerfQuery::PerfQuery()
}
ResetQuery();
}
PerfQuery::~PerfQuery()
void PerfQuery::DestroyDeviceObjects()
{
for (int i = 0; i != ARRAYSIZE(m_query_buffer); ++i)
{
@ -91,7 +100,7 @@ void PerfQuery::FlushOne()
{
auto& entry = m_query_buffer[m_query_read_pos];
UINT64 result = 0;
DWORD result = 0;
HRESULT hr = S_FALSE;
while (hr != S_OK && hr != D3DERR_DEVICELOST)
{
@ -100,7 +109,7 @@ void PerfQuery::FlushOne()
}
// NOTE: Reported pixel metrics should be referenced to native resolution
m_results[entry.query_type] += (u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight();
m_results[entry.query_type] += (u32)((u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight());
m_query_read_pos = (m_query_read_pos + 1) % ARRAYSIZE(m_query_buffer);
--m_query_count;
@ -119,13 +128,13 @@ void PerfQuery::WeakFlush()
{
auto& entry = m_query_buffer[m_query_read_pos];
UINT64 result = 0;
DWORD result = 0;
HRESULT hr = entry.query->GetData(&result, sizeof(result), 0);
if (hr == S_OK)
{
// NOTE: Reported pixel metrics should be referenced to native resolution
m_results[entry.query_type] += (u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight();
m_results[entry.query_type] += (u32)((u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight());
m_query_read_pos = (m_query_read_pos + 1) % ARRAYSIZE(m_query_buffer);
--m_query_count;