mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-04-24 22:34:54 +00:00
Merge 2397a3a915
into 879a8889aa
This commit is contained in:
commit
c3c111038e
3 changed files with 8 additions and 8 deletions
|
@ -71,8 +71,8 @@ void PerfQuery::DisableQuery(PerfQueryGroup group)
|
||||||
void PerfQuery::ResetQuery()
|
void PerfQuery::ResetQuery()
|
||||||
{
|
{
|
||||||
m_query_count.store(0, std::memory_order_relaxed);
|
m_query_count.store(0, std::memory_order_relaxed);
|
||||||
for (size_t i = 0; i < m_results.size(); ++i)
|
for (auto& result : m_results)
|
||||||
m_results[i].store(0, std::memory_order_relaxed);
|
result.store(0, std::memory_order_relaxed);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 PerfQuery::GetQueryResult(PerfQueryType type)
|
u32 PerfQuery::GetQueryResult(PerfQueryType type)
|
||||||
|
|
|
@ -80,12 +80,12 @@ bool VertexManager::Initialize()
|
||||||
D3D11_BIND_INDEX_BUFFER | D3D11_BIND_VERTEX_BUFFER,
|
D3D11_BIND_INDEX_BUFFER | D3D11_BIND_VERTEX_BUFFER,
|
||||||
D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
|
D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
|
||||||
|
|
||||||
for (int i = 0; i < BUFFER_COUNT; i++)
|
for (auto& buffer : m_buffers)
|
||||||
{
|
{
|
||||||
HRESULT hr = D3D::device->CreateBuffer(&bufdesc, nullptr, &m_buffers[i]);
|
HRESULT hr = D3D::device->CreateBuffer(&bufdesc, nullptr, &buffer);
|
||||||
ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Failed to create buffer: {}", DX11HRWrap(hr));
|
ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Failed to create buffer: {}", DX11HRWrap(hr));
|
||||||
if (m_buffers[i])
|
if (buffer)
|
||||||
D3DCommon::SetDebugObjectName(m_buffers[i].Get(), "Buffer of VertexManager");
|
D3DCommon::SetDebugObjectName(buffer.Get(), "Buffer of VertexManager");
|
||||||
}
|
}
|
||||||
|
|
||||||
m_vertex_constant_buffer = AllocateConstantBuffer(sizeof(VertexShaderConstants));
|
m_vertex_constant_buffer = AllocateConstantBuffer(sizeof(VertexShaderConstants));
|
||||||
|
|
|
@ -54,8 +54,8 @@ void PerfQuery::FlushResults()
|
||||||
void PerfQuery::ResetQuery()
|
void PerfQuery::ResetQuery()
|
||||||
{
|
{
|
||||||
m_query_count.store(0, std::memory_order_relaxed);
|
m_query_count.store(0, std::memory_order_relaxed);
|
||||||
for (size_t i = 0; i < m_results.size(); ++i)
|
for (auto& result : m_results)
|
||||||
m_results[i].store(0, std::memory_order_relaxed);
|
result.store(0, std::memory_order_relaxed);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 PerfQuery::GetQueryResult(PerfQueryType type)
|
u32 PerfQuery::GetQueryResult(PerfQueryType type)
|
||||||
|
|
Loading…
Add table
Reference in a new issue