franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2209 from lioncash/reorder 

video_core/gpu_thread: Silence a -Wreorder warning
This commit is contained in:
bunnei 2019-03-08 12:04:26 -05:00 committed by GitHub
parent 78c803b4f3 c2d4c8b95e
commit 160fc63c72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_core/gpu_thread.h
View File

@ -113,9 +113,6 @@ public:
/// Notify rasterizer that any caches of the specified region should be flushed and invalidated /// Notify rasterizer that any caches of the specified region should be flushed and invalidated
void FlushAndInvalidateRegion(VAddr addr, u64 size); void FlushAndInvalidateRegion(VAddr addr, u64 size);
/// Waits the caller until the GPU thread is idle, used for synchronization
void WaitForIdle();
private: private:
/// Pushes a command to be executed by the GPU thread /// Pushes a command to be executed by the GPU thread
void PushCommand(CommandData&& command_data, bool wait_for_idle, bool allow_on_cpu); void PushCommand(CommandData&& command_data, bool wait_for_idle, bool allow_on_cpu);
@ -127,10 +124,10 @@ private:
private: private:
SynchState state; SynchState state;
std::thread thread;
std::thread::id thread_id;
VideoCore::RendererBase& renderer; VideoCore::RendererBase& renderer;
Tegra::DmaPusher& dma_pusher; Tegra::DmaPusher& dma_pusher;
std::thread thread;
std::thread::id thread_id;
}; };
} // namespace VideoCommon::GPUThread } // namespace VideoCommon::GPUThread