diff options
| author | 2019-03-08 12:04:26 -0500 | |
|---|---|---|
| committer | 2019-03-08 12:04:26 -0500 | |
| commit | 160fc63c721bd633920e04f687f5e37435bb286d (patch) | |
| tree | 27aef9b133400e514a1de3208e150367ad45ac22 | |
| parent | Merge pull request #2208 from lioncash/gpu (diff) | |
| parent | video_core/gpu_thread: Remove unimplemented WaitForIdle function prototype (diff) | |
| download | yuzu-160fc63c721bd633920e04f687f5e37435bb286d.tar.gz yuzu-160fc63c721bd633920e04f687f5e37435bb286d.tar.xz yuzu-160fc63c721bd633920e04f687f5e37435bb286d.zip | |
Merge pull request #2209 from lioncash/reorder
video_core/gpu_thread: Silence a -Wreorder warning
| -rw-r--r-- | src/video_core/gpu_thread.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/video_core/gpu_thread.h b/src/video_core/gpu_thread.h index 2ad8214cc..edb148b14 100644 --- a/src/video_core/gpu_thread.h +++ b/src/video_core/gpu_thread.h | |||
| @@ -113,9 +113,6 @@ public: | |||
| 113 | /// Notify rasterizer that any caches of the specified region should be flushed and invalidated | 113 | /// Notify rasterizer that any caches of the specified region should be flushed and invalidated |
| 114 | void FlushAndInvalidateRegion(VAddr addr, u64 size); | 114 | void FlushAndInvalidateRegion(VAddr addr, u64 size); |
| 115 | 115 | ||
| 116 | /// Waits the caller until the GPU thread is idle, used for synchronization | ||
| 117 | void WaitForIdle(); | ||
| 118 | |||
| 119 | private: | 116 | private: |
| 120 | /// Pushes a command to be executed by the GPU thread | 117 | /// Pushes a command to be executed by the GPU thread |
| 121 | void PushCommand(CommandData&& command_data, bool wait_for_idle, bool allow_on_cpu); | 118 | void PushCommand(CommandData&& command_data, bool wait_for_idle, bool allow_on_cpu); |
| @@ -127,10 +124,10 @@ private: | |||
| 127 | 124 | ||
| 128 | private: | 125 | private: |
| 129 | SynchState state; | 126 | SynchState state; |
| 130 | std::thread thread; | ||
| 131 | std::thread::id thread_id; | ||
| 132 | VideoCore::RendererBase& renderer; | 127 | VideoCore::RendererBase& renderer; |
| 133 | Tegra::DmaPusher& dma_pusher; | 128 | Tegra::DmaPusher& dma_pusher; |
| 129 | std::thread thread; | ||
| 130 | std::thread::id thread_id; | ||
| 134 | }; | 131 | }; |
| 135 | 132 | ||
| 136 | } // namespace VideoCommon::GPUThread | 133 | } // namespace VideoCommon::GPUThread |