diff options
| author | JMC47 <JMC4789@gmail.com> | 2025-05-01 21:32:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-01 21:32:16 -0400 |
| commit | da4f643b9f9c01354febf55b25ff796d6bd116dd (patch) | |
| tree | d84b4f3d89ff0b05a85dc284add6a98a865bfcb4 /Source | |
| parent | 1963305bea7b1d971c9a4c0090d9982d75598be8 (diff) | |
| parent | ec940e6a2e5b297f62f3731cfdf0dae846d1313d (diff) | |
Merge pull request #13611 from jordan-woyak/work-queue-thread-sp
Core and Vulkan: Change WorkQueueThread to WorkQueueThreadSP in a few places.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/HW/DVD/DVDThread.h | 2 | ||||
| -rw-r--r-- | Source/Core/Core/IOS/Network/IP/Top.h | 2 | ||||
| -rw-r--r-- | Source/Core/Core/IOS/Network/KD/NetKDRequest.h | 4 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/CommandBufferManager.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/Core/HW/DVD/DVDThread.h b/Source/Core/Core/HW/DVD/DVDThread.h index 17aec87ef4..7b40e436c1 100644 --- a/Source/Core/Core/HW/DVD/DVDThread.h +++ b/Source/Core/Core/HW/DVD/DVDThread.h @@ -126,7 +126,7 @@ private: u64 m_next_id = 0; - Common::WorkQueueThread<ReadRequest> m_dvd_thread; + Common::WorkQueueThreadSP<ReadRequest> m_dvd_thread; Common::WaitableSPSCQueue<ReadResult> m_result_queue; std::map<u64, ReadResult> m_result_map; diff --git a/Source/Core/Core/IOS/Network/IP/Top.h b/Source/Core/Core/IOS/Network/IP/Top.h index 812cffad5d..f2a6290d9d 100644 --- a/Source/Core/Core/IOS/Network/IP/Top.h +++ b/Source/Core/Core/IOS/Network/IP/Top.h @@ -120,7 +120,7 @@ private: IPCReply HandleICMPPingRequest(const IOCtlVRequest& request); Common::SocketContext m_socket_context; - Common::WorkQueueThread<AsyncTask> m_work_queue; + Common::WorkQueueThreadSP<AsyncTask> m_work_queue; std::mutex m_async_reply_lock; std::queue<AsyncReply> m_async_replies; }; diff --git a/Source/Core/Core/IOS/Network/KD/NetKDRequest.h b/Source/Core/Core/IOS/Network/KD/NetKDRequest.h index 848454fa71..7158b22648 100644 --- a/Source/Core/Core/IOS/Network/KD/NetKDRequest.h +++ b/Source/Core/Core/IOS/Network/KD/NetKDRequest.h @@ -110,8 +110,8 @@ private: NWC24::NWC24Dl m_dl_list; NWC24::Mail::WC24SendList m_send_list; NWC24::Mail::WC24FriendList m_friend_list; - Common::WorkQueueThread<AsyncTask> m_work_queue; - Common::WorkQueueThread<std::function<void()>> m_scheduler_work_queue; + Common::WorkQueueThreadSP<AsyncTask> m_work_queue; + Common::WorkQueueThreadSP<std::function<void()>> m_scheduler_work_queue; std::mutex m_async_reply_lock; std::mutex m_scheduler_buffer_lock; std::queue<AsyncReply> m_async_replies; diff --git a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.h b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.h index c6f167cf38..f0eff4e955 100644 --- a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.h +++ b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.h @@ -161,7 +161,7 @@ private: u32 present_image_index; u32 command_buffer_index; }; - Common::WorkQueueThread<PendingCommandBufferSubmit> m_submit_thread; + Common::WorkQueueThreadSP<PendingCommandBufferSubmit> m_submit_thread; VkSemaphore m_present_semaphore = VK_NULL_HANDLE; Common::Flag m_last_present_failed; Common::Flag m_last_present_done; |
