clang format take 2

can the docker container save this?

src/audio_core/cubeb_sink.cpp

@@ -78,7 +78,7 @@ public:
                 const s16 surround_left{samples[i + 4]};
                 const s16 surround_right{samples[i + 5]};
                 // Not used in the ATSC reference implementation
-                [[maybe_unused]] const s16 low_frequency_effects{samples[i + 3]};
+                [[maybe_unused]] const s16 low_frequency_effects { samples[i + 3] };
 
                 constexpr s32 clev{707}; // center mixing level coefficient
                 constexpr s32 slev{707}; // surround mixing level coefficient

src/common/detached_tasks.cpp

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

src/common/math_util.h

@@ -54,6 +54,6 @@ struct Rectangle {
 };
 
 template <typename T>
-Rectangle(T, T, T, T) -> Rectangle<T>;
+Rectangle(T, T, T, T)->Rectangle<T>;
 
 } // namespace Common

src/core/file_sys/registered_cache.h

@@ -132,9 +132,9 @@ public:
     // 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
     // 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;
 
     void Refresh() override;

src/core/hle/kernel/memory/page_table.cpp

@@ -852,12 +852,11 @@ ResultCode PageTable::LockForDeviceAddressSpace(VAddr addr, std::size_t size) {
         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);
+                              },
-        },
+                              perm);
-        perm);
 
     return RESULT_SUCCESS;
 }
@@ -875,12 +874,11 @@ ResultCode PageTable::UnlockForDeviceAddressSpace(VAddr addr, std::size_t size)
         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);
+                              },
-        },
+                              perm);
-        perm);
 
     return RESULT_SUCCESS;
 }

src/core/hle/service/am/applets/web_browser.cpp

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

src/core/hle/service/audio/audout_u.cpp

@@ -206,7 +206,7 @@ private:
     AudioCore::StreamPtr stream;
     std::string device_name;
 
-    [[maybe_unused]] AudoutParams audio_params{};
+    [[maybe_unused]] AudoutParams audio_params {};
 
     /// This is the event handle used to check if the audio buffer was released
     Kernel::EventPair buffer_event;

src/core/hle/service/bcat/backend/boxcat.cpp

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

src/core/hle/service/nvdrv/interface.cpp

@@ -60,24 +60,24 @@ void NVDRV::IoctlBase(Kernel::HLERequestContext& ctx, IoctlVersion version) {
 
     if (ctrl.must_delay) {
         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);
-                }
+                                  }
-                IPC::ResponseBuilder rb{ctx, 3};
+                                  IPC::ResponseBuilder rb{ctx, 3};
-                rb.Push(RESULT_SUCCESS);
+                                  rb.Push(RESULT_SUCCESS);
-                rb.Push(result);
+                                  rb.Push(result);
-            },
+                              },
-            nvdrv->GetEventWriteable(ctrl.event_id));
+                              nvdrv->GetEventWriteable(ctrl.event_id));
     } else {
         ctx.WriteBuffer(output);
         if (version == IoctlVersion::Version3) {

src/input_common/udp/client.cpp

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

src/video_core/renderer_vulkan/wrapper.h

@@ -756,8 +756,8 @@ public:
     }
 
     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,
                                           flags);
     }
@@ -849,8 +849,8 @@ public:
         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);
     }
 
@@ -863,8 +863,8 @@ public:
         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);
     }
 
@@ -874,15 +874,15 @@ public:
                               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(),
                                    rects.data());
     }
 
     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(),
                             regions.data(), filter);
     }
@@ -907,8 +907,8 @@ public:
                                     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());
     }
 
@@ -924,8 +924,8 @@ public:
                                     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);
     }
 

src/video_core/shader/control_flow.cpp

@@ -187,26 +187,24 @@ std::optional<std::pair<BufferInfo, u64>> TrackLDC(const CFGRebuildState& state,
 
 std::optional<u64> TrackSHLRegister(const CFGRebuildState& state, u32& pos,
                                     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;
+                                 },
-        },
+                                 [](auto instr, const auto&) { return instr.gpr8.Value(); });
-        [](auto instr, const auto&) { return instr.gpr8.Value(); });
 }
 
 std::optional<u32> TrackIMNMXValue(const CFGRebuildState& state, u32& pos,
                                    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;
+                                 },
-        },
+                                 [](auto instr, const auto&) {
-        [](auto instr, const auto&) {
+                                     return static_cast<u32>(instr.alu.GetSignedImm20_20() + 1);
-            return static_cast<u32>(instr.alu.GetSignedImm20_20() + 1);
+                                 });
-        });
 }
 
 std::optional<BranchIndirectInfo> TrackBranchIndirectInfo(const CFGRebuildState& state, u32 pos) {

src/video_core/shader/decode/memory.cpp

@@ -471,9 +471,9 @@ std::tuple<Node, Node, GlobalMemoryBase> ShaderIR::TrackGlobalMemory(NodeBlock&
 
     const auto [base_address, index, offset] =
         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)));
 

src/yuzu/configuration/configure_input_player.cpp

@@ -281,25 +281,24 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
 
         button->setContextMenuPolicy(Qt::CustomContextMenu);
         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
+                            // work due to a different range of their signals (from 0 to 255 on
-                    // work due to a different range of their signals (from 0 to 255 on
+                            // analog triggers instead of -32768 to 32768 on analog joysticks). The
-                    // analog triggers instead of -32768 to 32768 on analog joysticks). The
+                            // SDL driver misinterprets analog triggers as analog joysticks.
-                    // SDL driver misinterprets analog triggers as analog joysticks.
+                            // TODO: reinterpret the signal range for analog triggers to map the
-                    // TODO: reinterpret the signal range for analog triggers to map the
+                            // values correctly. This is required for the correct emulation of the
-                    // values correctly. This is required for the correct emulation of the
+                            // analog triggers of the GameCube controller.
-                    // analog triggers of the GameCube controller.
+                            if (button_id == Settings::NativeButton::ZL ||
-                    if (button_id == Settings::NativeButton::ZL ||
+                                button_id == Settings::NativeButton::ZR) {
-                        button_id == Settings::NativeButton::ZR) {
+                                params.Set("direction", "+");
-                        params.Set("direction", "+");
+                                params.Set("threshold", "0.5");
-                        params.Set("threshold", "0.5");
+                            }
-                    }
+                            buttons_param[button_id] = std::move(params);
-                    buttons_param[button_id] = std::move(params);
+                        },
-                },
+                        InputCommon::Polling::DeviceType::Button);
-                InputCommon::Polling::DeviceType::Button);
         });
         connect(button, &QPushButton::customContextMenuRequested, [=](const QPoint& menu_location) {
             QMenu context_menu;
@@ -325,13 +324,12 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
 
             analog_button->setContextMenuPolicy(Qt::CustomContextMenu);
             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]);
+                            },
-                    },
+                            InputCommon::Polling::DeviceType::Button);
-                    InputCommon::Polling::DeviceType::Button);
             });
             connect(analog_button, &QPushButton::customContextMenuRequested,
                     [=](const QPoint& menu_location) {