diff options
| author | 2019-04-01 14:36:24 -0400 | |
|---|---|---|
| committer | 2019-04-01 14:36:24 -0400 | |
| commit | e0eee250bb4d70f4fc4973f08649636faf9808cf (patch) | |
| tree | eaf2aabd5471c13fe89ac5f7da247b3bf1248e83 /src/video_core/debug_utils | |
| parent | Merge pull request #2304 from lioncash/memsize (diff) | |
| parent | general: Use deducation guides for std::lock_guard and std::unique_lock (diff) | |
| download | yuzu-e0eee250bb4d70f4fc4973f08649636faf9808cf.tar.gz yuzu-e0eee250bb4d70f4fc4973f08649636faf9808cf.tar.xz yuzu-e0eee250bb4d70f4fc4973f08649636faf9808cf.zip | |
Merge pull request #2312 from lioncash/locks
general: Use deducation guides for std::lock_guard and std::unique_lock
Diffstat (limited to 'src/video_core/debug_utils')
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 5ffb492ea..f0ef67535 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp | |||
| @@ -10,7 +10,7 @@ namespace Tegra { | |||
| 10 | 10 | ||
| 11 | void DebugContext::DoOnEvent(Event event, void* data) { | 11 | void DebugContext::DoOnEvent(Event event, void* data) { |
| 12 | { | 12 | { |
| 13 | std::unique_lock<std::mutex> lock(breakpoint_mutex); | 13 | std::unique_lock lock{breakpoint_mutex}; |
| 14 | 14 | ||
| 15 | // TODO(Subv): Commit the rasterizer's caches so framebuffers, render targets, etc. will | 15 | // TODO(Subv): Commit the rasterizer's caches so framebuffers, render targets, etc. will |
| 16 | // show on debug widgets | 16 | // show on debug widgets |
| @@ -32,7 +32,7 @@ void DebugContext::DoOnEvent(Event event, void* data) { | |||
| 32 | 32 | ||
| 33 | void DebugContext::Resume() { | 33 | void DebugContext::Resume() { |
| 34 | { | 34 | { |
| 35 | std::lock_guard<std::mutex> lock(breakpoint_mutex); | 35 | std::lock_guard lock{breakpoint_mutex}; |
| 36 | 36 | ||
| 37 | // Tell all observers that we are about to resume | 37 | // Tell all observers that we are about to resume |
| 38 | for (auto& breakpoint_observer : breakpoint_observers) { | 38 | for (auto& breakpoint_observer : breakpoint_observers) { |
diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h index c235faf46..ac3a2eb01 100644 --- a/src/video_core/debug_utils/debug_utils.h +++ b/src/video_core/debug_utils/debug_utils.h | |||
| @@ -40,7 +40,7 @@ public: | |||
| 40 | /// Constructs the object such that it observes events of the given DebugContext. | 40 | /// Constructs the object such that it observes events of the given DebugContext. |
| 41 | explicit BreakPointObserver(std::shared_ptr<DebugContext> debug_context) | 41 | explicit BreakPointObserver(std::shared_ptr<DebugContext> debug_context) |
| 42 | : context_weak(debug_context) { | 42 | : context_weak(debug_context) { |
| 43 | std::unique_lock<std::mutex> lock(debug_context->breakpoint_mutex); | 43 | std::unique_lock lock{debug_context->breakpoint_mutex}; |
| 44 | debug_context->breakpoint_observers.push_back(this); | 44 | debug_context->breakpoint_observers.push_back(this); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| @@ -48,7 +48,7 @@ public: | |||
| 48 | auto context = context_weak.lock(); | 48 | auto context = context_weak.lock(); |
| 49 | if (context) { | 49 | if (context) { |
| 50 | { | 50 | { |
| 51 | std::unique_lock<std::mutex> lock(context->breakpoint_mutex); | 51 | std::unique_lock lock{context->breakpoint_mutex}; |
| 52 | context->breakpoint_observers.remove(this); | 52 | context->breakpoint_observers.remove(this); |
| 53 | } | 53 | } |
| 54 | 54 | ||