From 48a461a629e60079c505140b93cfbfa60ac9192d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 7 Mar 2019 16:05:46 -0500 Subject: [PATCH 1/2] video_core/gpu_thread: Amend constructor initializer list order Moves the data members to satisfy the order they're declared as in the constructor initializer list. Silences a -Wreorder warning. --- src/video_core/gpu_thread.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video_core/gpu_thread.h b/src/video_core/gpu_thread.h index 2ad8214cc..cedd9447b 100644 --- a/src/video_core/gpu_thread.h +++ b/src/video_core/gpu_thread.h @@ -127,10 +127,10 @@ private: private: SynchState state; - std::thread thread; - std::thread::id thread_id; VideoCore::RendererBase& renderer; Tegra::DmaPusher& dma_pusher; + std::thread thread; + std::thread::id thread_id; }; } // namespace VideoCommon::GPUThread From c2d4c8b95ed2052319608aab500b29c363d6b0bb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 7 Mar 2019 16:08:09 -0500 Subject: [PATCH 2/2] video_core/gpu_thread: Remove unimplemented WaitForIdle function prototype This function didn't have a definition, so we can remove it to prevent accidentally attempting to use it. --- src/video_core/gpu_thread.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/video_core/gpu_thread.h b/src/video_core/gpu_thread.h index cedd9447b..edb148b14 100644 --- a/src/video_core/gpu_thread.h +++ b/src/video_core/gpu_thread.h @@ -113,9 +113,6 @@ public: /// Notify rasterizer that any caches of the specified region should be flushed and invalidated void FlushAndInvalidateRegion(VAddr addr, u64 size); - /// Waits the caller until the GPU thread is idle, used for synchronization - void WaitForIdle(); - private: /// Pushes a command to be executed by the GPU thread void PushCommand(CommandData&& command_data, bool wait_for_idle, bool allow_on_cpu);