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

Merge 2397a3a915 into 1ae0b23265

This commit is contained in:
Tygyh 2025-04-19 10:41:49 -05:00 committed by GitHub
parent 1ae0b23265 2397a3a915
commit f0774519c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoBackends/D3D/D3DPerfQuery.cpp
View File

@ -71,8 +71,8 @@ void PerfQuery::DisableQuery(PerfQueryGroup group)
void PerfQuery::ResetQuery()
{
m_query_count.store(0, std::memory_order_relaxed);
for (size_t i = 0; i < m_results.size(); ++i)
m_results[i].store(0, std::memory_order_relaxed);
for (auto& result : m_results)
result.store(0, std::memory_order_relaxed);
}
u32 PerfQuery::GetQueryResult(PerfQueryType type)

8
Source/Core/VideoBackends/D3D/D3DVertexManager.cpp
View File

@ -80,12 +80,12 @@ bool VertexManager::Initialize()
D3D11_BIND_INDEX_BUFFER | D3D11_BIND_VERTEX_BUFFER,
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));
if (m_buffers[i])
D3DCommon::SetDebugObjectName(m_buffers[i].Get(), "Buffer of VertexManager");
if (buffer)
D3DCommon::SetDebugObjectName(buffer.Get(), "Buffer of VertexManager");
}
m_vertex_constant_buffer = AllocateConstantBuffer(sizeof(VertexShaderConstants));

4
Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp
View File

@ -54,8 +54,8 @@ void PerfQuery::FlushResults()
void PerfQuery::ResetQuery()
{
m_query_count.store(0, std::memory_order_relaxed);
for (size_t i = 0; i < m_results.size(); ++i)
m_results[i].store(0, std::memory_order_relaxed);
for (auto& result : m_results)
result.store(0, std::memory_order_relaxed);
}
u32 PerfQuery::GetQueryResult(PerfQueryType type)