diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/host1x/syncpoint_manager.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/host1x/syncpoint_manager.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/host1x/syncpoint_manager.cpp b/src/video_core/host1x/syncpoint_manager.cpp index a44fc83d3..8f23ce527 100644 --- a/src/video_core/host1x/syncpoint_manager.cpp +++ b/src/video_core/host1x/syncpoint_manager.cpp | |||
| @@ -34,7 +34,7 @@ SyncpointManager::ActionHandle SyncpointManager::RegisterAction( | |||
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | void SyncpointManager::DeregisterAction(std::list<RegisteredAction>& action_storage, | 36 | void SyncpointManager::DeregisterAction(std::list<RegisteredAction>& action_storage, |
| 37 | ActionHandle& handle) { | 37 | const ActionHandle& handle) { |
| 38 | std::unique_lock lk(guard); | 38 | std::unique_lock lk(guard); |
| 39 | 39 | ||
| 40 | // We want to ensure the iterator still exists prior to erasing it | 40 | // We want to ensure the iterator still exists prior to erasing it |
| @@ -49,11 +49,11 @@ void SyncpointManager::DeregisterAction(std::list<RegisteredAction>& action_stor | |||
| 49 | } | 49 | } |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | void SyncpointManager::DeregisterGuestAction(u32 syncpoint_id, ActionHandle& handle) { | 52 | void SyncpointManager::DeregisterGuestAction(u32 syncpoint_id, const ActionHandle& handle) { |
| 53 | DeregisterAction(guest_action_storage[syncpoint_id], handle); | 53 | DeregisterAction(guest_action_storage[syncpoint_id], handle); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | void SyncpointManager::DeregisterHostAction(u32 syncpoint_id, ActionHandle& handle) { | 56 | void SyncpointManager::DeregisterHostAction(u32 syncpoint_id, const ActionHandle& handle) { |
| 57 | DeregisterAction(host_action_storage[syncpoint_id], handle); | 57 | DeregisterAction(host_action_storage[syncpoint_id], handle); |
| 58 | } | 58 | } |
| 59 | 59 | ||
diff --git a/src/video_core/host1x/syncpoint_manager.h b/src/video_core/host1x/syncpoint_manager.h index 50a264e23..feafc926e 100644 --- a/src/video_core/host1x/syncpoint_manager.h +++ b/src/video_core/host1x/syncpoint_manager.h | |||
| @@ -48,9 +48,9 @@ public: | |||
| 48 | expected_value, std::move(func)); | 48 | expected_value, std::move(func)); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | void DeregisterGuestAction(u32 syncpoint_id, ActionHandle& handle); | 51 | void DeregisterGuestAction(u32 syncpoint_id, const ActionHandle& handle); |
| 52 | 52 | ||
| 53 | void DeregisterHostAction(u32 syncpoint_id, ActionHandle& handle); | 53 | void DeregisterHostAction(u32 syncpoint_id, const ActionHandle& handle); |
| 54 | 54 | ||
| 55 | void IncrementGuest(u32 syncpoint_id); | 55 | void IncrementGuest(u32 syncpoint_id); |
| 56 | 56 | ||
| @@ -76,7 +76,7 @@ private: | |||
| 76 | std::list<RegisteredAction>& action_storage, u32 expected_value, | 76 | std::list<RegisteredAction>& action_storage, u32 expected_value, |
| 77 | std::function<void()>&& action); | 77 | std::function<void()>&& action); |
| 78 | 78 | ||
| 79 | void DeregisterAction(std::list<RegisteredAction>& action_storage, ActionHandle& handle); | 79 | void DeregisterAction(std::list<RegisteredAction>& action_storage, const ActionHandle& handle); |
| 80 | 80 | ||
| 81 | void Wait(std::atomic<u32>& syncpoint, std::condition_variable& wait_cv, u32 expected_value); | 81 | void Wait(std::atomic<u32>& syncpoint, std::condition_variable& wait_cv, u32 expected_value); |
| 82 | 82 | ||