diff options
| author | 2022-01-04 14:16:24 +0100 | |
|---|---|---|
| committer | 2022-01-04 14:16:24 +0100 | |
| commit | 118d5fa3b0fdc070f57916203dbbb999fe7e3c69 (patch) | |
| tree | dcea9a661fb5595fd255fa62e81d82c9a3aef822 /src/core/hle | |
| parent | Merge pull request #7251 from FernandoS27/shader-dump (diff) | |
| parent | gpu: Add shut down method to synchronize threads before destruction (diff) | |
| download | yuzu-118d5fa3b0fdc070f57916203dbbb999fe7e3c69.tar.gz yuzu-118d5fa3b0fdc070f57916203dbbb999fe7e3c69.tar.xz yuzu-118d5fa3b0fdc070f57916203dbbb999fe7e3c69.zip | |
Merge pull request #7670 from ameerj/vsync-block
gpu: Add shut down method to synchronize threads before destruction
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/nvflinger/nvflinger.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp index 396cc5afa..a22811ec1 100644 --- a/src/core/hle/service/nvflinger/nvflinger.cpp +++ b/src/core/hle/service/nvflinger/nvflinger.cpp | |||
| @@ -266,11 +266,10 @@ 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(); | ||
| 270 | guard->unlock(); | 269 | guard->unlock(); |
| 271 | for (u32 fence_id = 0; fence_id < multi_fence.num_fences; fence_id++) { | 270 | for (u32 fence_id = 0; fence_id < multi_fence.num_fences; fence_id++) { |
| 272 | const auto& fence = multi_fence.fences[fence_id]; | 271 | const auto& fence = multi_fence.fences[fence_id]; |
| 273 | gpu.WaitFence(fence.id, fence.value, stop_token); | 272 | gpu.WaitFence(fence.id, fence.value); |
| 274 | } | 273 | } |
| 275 | guard->lock(); | 274 | guard->lock(); |
| 276 | 275 | ||