diff options
| author | 2022-01-03 20:28:54 -0500 | |
|---|---|---|
| committer | 2022-01-03 20:28:54 -0500 | |
| commit | 76525432317fcc4b4847c5414bed6660c85e582b (patch) | |
| tree | 38f9f01b22cb2bc4cd1c012725094133b7587d22 /src/video_core/gpu.h | |
| parent | Merge pull request #7668 from ameerj/fence-stop-token (diff) | |
| download | yuzu-76525432317fcc4b4847c5414bed6660c85e582b.tar.gz yuzu-76525432317fcc4b4847c5414bed6660c85e582b.tar.xz yuzu-76525432317fcc4b4847c5414bed6660c85e582b.zip | |
Revert "Merge pull request #7668 from ameerj/fence-stop-token"
This reverts commit e7733544779f2706d108682dd027d44e7fa5ff4b, reversing
changes made to abbbdc2bc027ed7af236625ae8427a46df63f7e7.
Diffstat (limited to 'src/video_core/gpu.h')
| -rw-r--r-- | src/video_core/gpu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h index cc65a7870..500411176 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <memory> | 7 | #include <memory> |
| 8 | #include <stop_token> | ||
| 9 | 8 | ||
| 10 | #include "common/bit_field.h" | 9 | #include "common/bit_field.h" |
| 11 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| @@ -210,7 +209,7 @@ public: | |||
| 210 | [[nodiscard]] const VideoCore::ShaderNotify& ShaderNotify() const; | 209 | [[nodiscard]] const VideoCore::ShaderNotify& ShaderNotify() const; |
| 211 | 210 | ||
| 212 | /// Allows the CPU/NvFlinger to wait on the GPU before presenting a frame. | 211 | /// Allows the CPU/NvFlinger to wait on the GPU before presenting a frame. |
| 213 | void WaitFence(u32 syncpoint_id, u32 value, std::stop_token stop_token = {}); | 212 | void WaitFence(u32 syncpoint_id, u32 value); |
| 214 | 213 | ||
| 215 | void IncrementSyncPoint(u32 syncpoint_id); | 214 | void IncrementSyncPoint(u32 syncpoint_id); |
| 216 | 215 | ||