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

Merge pull request #11528 from delroth/clang-format-13 

lint: update to clang-format-13
This commit is contained in:
Scott Mansell 2023-02-02 17:13:48 +13:00 committed by GitHub
parent 69b178e95f c92de420ef
commit 6669d160b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoBackends/Metal/MTLObjectCache.mm
View File

@ -91,8 +91,8 @@ static const char* to_string(MTLCompareFunction compare)
// clang-format on // clang-format on
static void SetupDepthStencil( static void
MRCOwned<id<MTLDepthStencilState>> (&dss)[Metal::DepthStencilSelector::N_VALUES]) SetupDepthStencil(MRCOwned<id<MTLDepthStencilState>> (&dss)[Metal::DepthStencilSelector::N_VALUES])
{ {
auto desc = MRCTransfer([MTLDepthStencilDescriptor new]); auto desc = MRCTransfer([MTLDepthStencilDescriptor new]);
Metal::DepthStencilSelector sel; Metal::DepthStencilSelector sel;

29
Source/Core/VideoBackends/Metal/MTLStateTracker.mm
View File

@ -434,22 +434,23 @@ void Metal::StateTracker::FlushEncoders()
m_texture_upload_cmdbuf = nullptr; m_texture_upload_cmdbuf = nullptr;
} }
[m_current_render_cmdbuf [m_current_render_cmdbuf
addCompletedHandler:[backref = m_backref, draw = m_current_draw, addCompletedHandler:[backref = m_backref, draw = m_current_draw,
q = std::move(m_current_perf_query)](id<MTLCommandBuffer> buf) { q = std::move(m_current_perf_query)](id<MTLCommandBuffer> buf) {
std::lock_guard<std::mutex> guard(backref->mtx); std::lock_guard<std::mutex> guard(backref->mtx);
if (StateTracker* tracker = backref->state_tracker) if (StateTracker* tracker = backref->state_tracker)
{
// We can do the update non-atomically because we only ever update under the lock
u64 newval = std::max(draw, tracker->m_last_finished_draw.load(std::memory_order_relaxed));
tracker->m_last_finished_draw.store(newval, std::memory_order_release);
if (q)
{ {
if (PerfQuery* query = static_cast<PerfQuery*>(g_perf_query.get())) // We can do the update non-atomically because we only ever update under the lock
query->ReturnResults(q->contents, q->groups.data(), q->groups.size(), q->query_id); u64 newval =
tracker->m_perf_query_tracker_cache.emplace_back(std::move(q)); std::max(draw, tracker->m_last_finished_draw.load(std::memory_order_relaxed));
tracker->m_last_finished_draw.store(newval, std::memory_order_release);
if (q)
{
if (PerfQuery* query = static_cast<PerfQuery*>(g_perf_query.get()))
query->ReturnResults(q->contents, q->groups.data(), q->groups.size(), q->query_id);
tracker->m_perf_query_tracker_cache.emplace_back(std::move(q));
}
} }
} }];
}];
m_current_perf_query = nullptr; m_current_perf_query = nullptr;
[m_current_render_cmdbuf commit]; [m_current_render_cmdbuf commit];
m_last_render_cmdbuf = std::move(m_current_render_cmdbuf); m_last_render_cmdbuf = std::move(m_current_render_cmdbuf);

2
Tools/lint.sh
View File

@ -18,7 +18,7 @@ if ! [ -x "$(command -v $GIT)" ]; then
exit 1 exit 1
fi fi
REQUIRED_CLANG_FORMAT_MAJOR=12 REQUIRED_CLANG_FORMAT_MAJOR=13
REQUIRED_CLANG_FORMAT_MINOR=0 REQUIRED_CLANG_FORMAT_MINOR=0
CLANG_FORMAT=clang-format CLANG_FORMAT=clang-format
CLANG_FORMAT_MAJOR=clang-format-${REQUIRED_CLANG_FORMAT_MAJOR} CLANG_FORMAT_MAJOR=clang-format-${REQUIRED_CLANG_FORMAT_MAJOR}