diff options
| author | 2022-01-03 16:40:36 -0800 | |
|---|---|---|
| committer | 2022-01-03 16:40:36 -0800 | |
| commit | e7733544779f2706d108682dd027d44e7fa5ff4b (patch) | |
| tree | 9662605d300e28c2e7722ecdc978b65f97b568cb /src/core | |
| parent | Merge pull request #7664 from german77/fallback (diff) | |
| parent | gpu: Use std::stop_token in WaitFence for VSync thread (diff) | |
| download | yuzu-e7733544779f2706d108682dd027d44e7fa5ff4b.tar.gz yuzu-e7733544779f2706d108682dd027d44e7fa5ff4b.tar.xz yuzu-e7733544779f2706d108682dd027d44e7fa5ff4b.zip | |
Merge pull request #7668 from ameerj/fence-stop-token
gpu: Use std::stop_token in WaitFence for VSync thread
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/nvflinger/nvflinger.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp index a22811ec1..396cc5afa 100644 --- a/src/core/hle/service/nvflinger/nvflinger.cpp +++ b/src/core/hle/service/nvflinger/nvflinger.cpp | |||
| @@ -266,10 +266,11 @@ void NVFlinger::Compose() { | |||
| 266 | 266 | ||
| 267 | auto& gpu = system.GPU(); | 267 | auto& gpu = system.GPU(); |
| 268 | const auto& multi_fence = buffer->get().multi_fence; | 268 | const auto& multi_fence = buffer->get().multi_fence; |
| 269 | const auto stop_token = vsync_thread.get_stop_token(); | ||
| 269 | guard->unlock(); | 270 | guard->unlock(); |
| 270 | for (u32 fence_id = 0; fence_id < multi_fence.num_fences; fence_id++) { | 271 | for (u32 fence_id = 0; fence_id < multi_fence.num_fences; fence_id++) { |
| 271 | const auto& fence = multi_fence.fences[fence_id]; | 272 | const auto& fence = multi_fence.fences[fence_id]; |
| 272 | gpu.WaitFence(fence.id, fence.value); | 273 | gpu.WaitFence(fence.id, fence.value, stop_token); |
| 273 | } | 274 | } |
| 274 | guard->lock(); | 275 | guard->lock(); |
| 275 | 276 | ||