clang format take 2

can the docker container save this?
This commit is contained in:
lat9nq
2020-06-23 15:20:40 -04:00
parent 5afe9a375a
commit 08018d985c
14 changed files with 100 additions and 102 deletions

View File

@@ -34,7 +34,8 @@ void DetachedTasks::AddTask(std::function<void()> task) {
std::unique_lock lock{instance->mutex}; std::unique_lock lock{instance->mutex};
--instance->count; --instance->count;
std::notify_all_at_thread_exit(instance->cv, std::move(lock)); std::notify_all_at_thread_exit(instance->cv, std::move(lock));
}).detach(); })
.detach();
} }
} // namespace Common } // namespace Common

View File

@@ -132,8 +132,8 @@ public:
// Parsing function defines the conversion from raw file to NCA. If there are other steps // Parsing function defines the conversion from raw file to NCA. If there are other steps
// besides creating the NCA from the file (e.g. NAX0 on SD Card), that should go in a custom // besides creating the NCA from the file (e.g. NAX0 on SD Card), that should go in a custom
// parsing function. // parsing function.
explicit RegisteredCache( explicit RegisteredCache(VirtualDir dir,
VirtualDir dir, ContentProviderParsingFunction parsing_function = ContentProviderParsingFunction parsing_function =
[](const VirtualFile& file, const NcaID& id) { return file; }); [](const VirtualFile& file, const NcaID& id) { return file; });
~RegisteredCache() override; ~RegisteredCache() override;

View File

@@ -852,8 +852,7 @@ ResultCode PageTable::LockForDeviceAddressSpace(VAddr addr, std::size_t size) {
return result; return result;
} }
block_manager->UpdateLock( block_manager->UpdateLock(addr, size / PageSize,
addr, size / PageSize,
[](MemoryBlockManager::iterator block, MemoryPermission perm) { [](MemoryBlockManager::iterator block, MemoryPermission perm) {
block->ShareToDevice(perm); block->ShareToDevice(perm);
}, },
@@ -875,8 +874,7 @@ ResultCode PageTable::UnlockForDeviceAddressSpace(VAddr addr, std::size_t size)
return result; return result;
} }
block_manager->UpdateLock( block_manager->UpdateLock(addr, size / PageSize,
addr, size / PageSize,
[](MemoryBlockManager::iterator block, MemoryPermission perm) { [](MemoryBlockManager::iterator block, MemoryPermission perm) {
block->UnshareToDevice(perm); block->UnshareToDevice(perm);
}, },

View File

@@ -551,8 +551,7 @@ void WebBrowser::ExecuteShop() {
} }
void WebBrowser::ExecuteOffline() { void WebBrowser::ExecuteOffline() {
frontend.OpenPageLocal( frontend.OpenPageLocal(filename, [this] { UnpackRomFS(); }, [this] { Finalize(); });
filename, [this] { UnpackRomFS(); }, [this] { Finalize(); });
} }
} // namespace Service::AM::Applets } // namespace Service::AM::Applets

View File

@@ -365,7 +365,8 @@ bool Boxcat::Synchronize(TitleIDVersion title, ProgressServiceBackend& progress)
std::thread([this, title, &progress] { std::thread([this, title, &progress] {
SynchronizeInternal(applet_manager, dir_getter, title, progress); SynchronizeInternal(applet_manager, dir_getter, title, progress);
}).detach(); })
.detach();
return true; return true;
} }
@@ -376,7 +377,8 @@ bool Boxcat::SynchronizeDirectory(TitleIDVersion title, std::string name,
std::thread([this, title, name, &progress] { std::thread([this, title, name, &progress] {
SynchronizeInternal(applet_manager, dir_getter, title, progress, name); SynchronizeInternal(applet_manager, dir_getter, title, progress, name);
}).detach(); })
.detach();
return true; return true;
} }

View File

@@ -60,15 +60,15 @@ void NVDRV::IoctlBase(Kernel::HLERequestContext& ctx, IoctlVersion version) {
if (ctrl.must_delay) { if (ctrl.must_delay) {
ctrl.fresh_call = false; ctrl.fresh_call = false;
ctx.SleepClientThread( ctx.SleepClientThread("NVServices::DelayedResponse", ctrl.timeout,
"NVServices::DelayedResponse", ctrl.timeout, [=](std::shared_ptr<Kernel::Thread> thread,
[=](std::shared_ptr<Kernel::Thread> thread, Kernel::HLERequestContext& ctx, Kernel::HLERequestContext& ctx,
Kernel::ThreadWakeupReason reason) { Kernel::ThreadWakeupReason reason) {
IoctlCtrl ctrl2{ctrl}; IoctlCtrl ctrl2{ctrl};
std::vector<u8> tmp_output = output; std::vector<u8> tmp_output = output;
std::vector<u8> tmp_output2 = output2; std::vector<u8> tmp_output2 = output2;
u32 result = nvdrv->Ioctl(fd, command, input, input2, tmp_output, tmp_output2, u32 result = nvdrv->Ioctl(fd, command, input, input2, tmp_output,
ctrl2, version); tmp_output2, ctrl2, version);
ctx.WriteBuffer(tmp_output, 0); ctx.WriteBuffer(tmp_output, 0);
if (version == IoctlVersion::Version3) { if (version == IoctlVersion::Version3) {
ctx.WriteBuffer(tmp_output2, 1); ctx.WriteBuffer(tmp_output2, 1);

View File

@@ -225,7 +225,8 @@ void TestCommunication(const std::string& host, u16 port, u8 pad_index, u32 clie
} else { } else {
failure_callback(); failure_callback();
} }
}).detach(); })
.detach();
} }
CalibrationConfigurationJob::CalibrationConfigurationJob( CalibrationConfigurationJob::CalibrationConfigurationJob(
@@ -279,7 +280,8 @@ CalibrationConfigurationJob::CalibrationConfigurationJob(
complete_event.Wait(); complete_event.Wait();
socket.Stop(); socket.Stop();
worker_thread.join(); worker_thread.join();
}).detach(); })
.detach();
} }
CalibrationConfigurationJob::~CalibrationConfigurationJob() { CalibrationConfigurationJob::~CalibrationConfigurationJob() {

View File

@@ -756,8 +756,8 @@ public:
} }
VkResult GetQueryResults(VkQueryPool query_pool, u32 first, u32 count, std::size_t data_size, VkResult GetQueryResults(VkQueryPool query_pool, u32 first, u32 count, std::size_t data_size,
void* data, VkDeviceSize stride, void* data, VkDeviceSize stride, VkQueryResultFlags flags) const
VkQueryResultFlags flags) const noexcept { noexcept {
return dld->vkGetQueryPoolResults(handle, query_pool, first, count, data_size, data, stride, return dld->vkGetQueryPoolResults(handle, query_pool, first, count, data_size, data, stride,
flags); flags);
} }
@@ -849,8 +849,8 @@ public:
dld->vkCmdBindPipeline(handle, bind_point, pipeline); dld->vkCmdBindPipeline(handle, bind_point, pipeline);
} }
void BindIndexBuffer(VkBuffer buffer, VkDeviceSize offset, void BindIndexBuffer(VkBuffer buffer, VkDeviceSize offset, VkIndexType index_type) const
VkIndexType index_type) const noexcept { noexcept {
dld->vkCmdBindIndexBuffer(handle, buffer, offset, index_type); dld->vkCmdBindIndexBuffer(handle, buffer, offset, index_type);
} }
@@ -863,8 +863,8 @@ public:
BindVertexBuffers(binding, 1, &buffer, &offset); BindVertexBuffers(binding, 1, &buffer, &offset);
} }
void Draw(u32 vertex_count, u32 instance_count, u32 first_vertex, void Draw(u32 vertex_count, u32 instance_count, u32 first_vertex, u32 first_instance) const
u32 first_instance) const noexcept { noexcept {
dld->vkCmdDraw(handle, vertex_count, instance_count, first_vertex, first_instance); dld->vkCmdDraw(handle, vertex_count, instance_count, first_vertex, first_instance);
} }
@@ -874,15 +874,15 @@ public:
first_instance); first_instance);
} }
void ClearAttachments(Span<VkClearAttachment> attachments, void ClearAttachments(Span<VkClearAttachment> attachments, Span<VkClearRect> rects) const
Span<VkClearRect> rects) const noexcept { noexcept {
dld->vkCmdClearAttachments(handle, attachments.size(), attachments.data(), rects.size(), dld->vkCmdClearAttachments(handle, attachments.size(), attachments.data(), rects.size(),
rects.data()); rects.data());
} }
void BlitImage(VkImage src_image, VkImageLayout src_layout, VkImage dst_image, void BlitImage(VkImage src_image, VkImageLayout src_layout, VkImage dst_image,
VkImageLayout dst_layout, Span<VkImageBlit> regions, VkImageLayout dst_layout, Span<VkImageBlit> regions, VkFilter filter) const
VkFilter filter) const noexcept { noexcept {
dld->vkCmdBlitImage(handle, src_image, src_layout, dst_image, dst_layout, regions.size(), dld->vkCmdBlitImage(handle, src_image, src_layout, dst_image, dst_layout, regions.size(),
regions.data(), filter); regions.data(), filter);
} }
@@ -907,8 +907,8 @@ public:
regions.data()); regions.data());
} }
void CopyBuffer(VkBuffer src_buffer, VkBuffer dst_buffer, void CopyBuffer(VkBuffer src_buffer, VkBuffer dst_buffer, Span<VkBufferCopy> regions) const
Span<VkBufferCopy> regions) const noexcept { noexcept {
dld->vkCmdCopyBuffer(handle, src_buffer, dst_buffer, regions.size(), regions.data()); dld->vkCmdCopyBuffer(handle, src_buffer, dst_buffer, regions.size(), regions.data());
} }
@@ -924,8 +924,8 @@ public:
regions.data()); regions.data());
} }
void FillBuffer(VkBuffer dst_buffer, VkDeviceSize dst_offset, VkDeviceSize size, void FillBuffer(VkBuffer dst_buffer, VkDeviceSize dst_offset, VkDeviceSize size, u32 data) const
u32 data) const noexcept { noexcept {
dld->vkCmdFillBuffer(handle, dst_buffer, dst_offset, size, data); dld->vkCmdFillBuffer(handle, dst_buffer, dst_offset, size, data);
} }

View File

@@ -187,8 +187,7 @@ std::optional<std::pair<BufferInfo, u64>> TrackLDC(const CFGRebuildState& state,
std::optional<u64> TrackSHLRegister(const CFGRebuildState& state, u32& pos, std::optional<u64> TrackSHLRegister(const CFGRebuildState& state, u32& pos,
u64 ldc_tracked_register) { u64 ldc_tracked_register) {
return TrackInstruction<u64>( return TrackInstruction<u64>(state, pos,
state, pos,
[ldc_tracked_register](auto instr, const auto& opcode) { [ldc_tracked_register](auto instr, const auto& opcode) {
return opcode.GetId() == OpCode::Id::SHL_IMM && return opcode.GetId() == OpCode::Id::SHL_IMM &&
instr.gpr0.Value() == ldc_tracked_register; instr.gpr0.Value() == ldc_tracked_register;
@@ -198,8 +197,7 @@ std::optional<u64> TrackSHLRegister(const CFGRebuildState& state, u32& pos,
std::optional<u32> TrackIMNMXValue(const CFGRebuildState& state, u32& pos, std::optional<u32> TrackIMNMXValue(const CFGRebuildState& state, u32& pos,
u64 shl_tracked_register) { u64 shl_tracked_register) {
return TrackInstruction<u32>( return TrackInstruction<u32>(state, pos,
state, pos,
[shl_tracked_register](auto instr, const auto& opcode) { [shl_tracked_register](auto instr, const auto& opcode) {
return opcode.GetId() == OpCode::Id::IMNMX_IMM && return opcode.GetId() == OpCode::Id::IMNMX_IMM &&
instr.gpr0.Value() == shl_tracked_register; instr.gpr0.Value() == shl_tracked_register;

View File

@@ -471,8 +471,8 @@ std::tuple<Node, Node, GlobalMemoryBase> ShaderIR::TrackGlobalMemory(NodeBlock&
const auto [base_address, index, offset] = const auto [base_address, index, offset] =
TrackCbuf(addr_register, global_code, static_cast<s64>(global_code.size())); TrackCbuf(addr_register, global_code, static_cast<s64>(global_code.size()));
ASSERT_OR_EXECUTE_MSG( ASSERT_OR_EXECUTE_MSG(base_address != nullptr,
base_address != nullptr, { return std::make_tuple(nullptr, nullptr, GlobalMemoryBase{}); }, { return std::make_tuple(nullptr, nullptr, GlobalMemoryBase{}); },
"Global memory tracking failed"); "Global memory tracking failed");
bb.push_back(Comment(fmt::format("Base address is c[0x{:x}][0x{:x}]", index, offset))); bb.push_back(Comment(fmt::format("Base address is c[0x{:x}][0x{:x}]", index, offset)));

View File

@@ -281,8 +281,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
button->setContextMenuPolicy(Qt::CustomContextMenu); button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(button, &QPushButton::clicked, [=] { connect(button, &QPushButton::clicked, [=] {
HandleClick( HandleClick(button_map[button_id],
button_map[button_id],
[=](Common::ParamPackage params) { [=](Common::ParamPackage params) {
// Workaround for ZL & ZR for analog triggers like on XBOX controllors. // Workaround for ZL & ZR for analog triggers like on XBOX controllors.
// Analog triggers (from controllers like the XBOX controller) would not // Analog triggers (from controllers like the XBOX controller) would not
@@ -325,8 +324,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
analog_button->setContextMenuPolicy(Qt::CustomContextMenu); analog_button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(analog_button, &QPushButton::clicked, [=]() { connect(analog_button, &QPushButton::clicked, [=]() {
HandleClick( HandleClick(analog_map_buttons[analog_id][sub_button_id],
analog_map_buttons[analog_id][sub_button_id],
[=](const Common::ParamPackage& params) { [=](const Common::ParamPackage& params) {
SetAnalogButton(params, analogs_param[analog_id], SetAnalogButton(params, analogs_param[analog_id],
analog_sub_buttons[sub_button_id]); analog_sub_buttons[sub_button_id]);