summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-07-26 00:53:25 +0200
committerLioncash <mathew1800@gmail.com>2020-07-26 01:04:53 +0200
commit5dab23e0171fd9fcb1976ac13e484ee7cf166e29 (patch)
treebbffe822135d0e9578588b01fae8bf807c1cbe3a
parentMerge pull request #4350 from ogniK5377/hid-update-connected (diff)
downloadyuzu-5dab23e0171fd9fcb1976ac13e484ee7cf166e29.tar
yuzu-5dab23e0171fd9fcb1976ac13e484ee7cf166e29.tar.gz
yuzu-5dab23e0171fd9fcb1976ac13e484ee7cf166e29.tar.bz2
yuzu-5dab23e0171fd9fcb1976ac13e484ee7cf166e29.tar.lz
yuzu-5dab23e0171fd9fcb1976ac13e484ee7cf166e29.tar.xz
yuzu-5dab23e0171fd9fcb1976ac13e484ee7cf166e29.tar.zst
yuzu-5dab23e0171fd9fcb1976ac13e484ee7cf166e29.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.cpp2
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.h2
-rw-r--r--src/core/hle/service/vi/vi.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp
index 789856118..e561bf654 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvflinger/nvflinger.cpp
@@ -68,7 +68,7 @@ NVFlinger::NVFlinger(Core::System& system) : system(system) {
// Schedule the screen composition events
composition_event = Core::Timing::CreateEvent(
"ScreenComposition", [this](u64, std::chrono::nanoseconds ns_late) {
- Lock();
+ const auto guard = Lock();
Compose();
const auto ticks = std::chrono::nanoseconds{GetNextTicks()};
diff --git a/src/core/hle/service/nvflinger/nvflinger.h b/src/core/hle/service/nvflinger/nvflinger.h
index e4959a9af..0be55e442 100644
--- a/src/core/hle/service/nvflinger/nvflinger.h
+++ b/src/core/hle/service/nvflinger/nvflinger.h
@@ -86,7 +86,7 @@ public:
s64 GetNextTicks() const;
- std::unique_lock<std::mutex> Lock() {
+ std::unique_lock<std::mutex> Lock() const {
return std::unique_lock{*guard};
}
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp
index ea7b4ae13..825d11a3f 100644
--- a/src/core/hle/service/vi/vi.cpp
+++ b/src/core/hle/service/vi/vi.cpp
@@ -511,7 +511,7 @@ private:
LOG_DEBUG(Service_VI, "called. id=0x{:08X} transaction={:X}, flags=0x{:08X}", id,
static_cast<u32>(transaction), flags);
- nv_flinger->Lock();
+ const auto guard = nv_flinger->Lock();
auto& buffer_queue = nv_flinger->FindBufferQueue(id);
switch (transaction) {
@@ -551,7 +551,7 @@ private:
[=](std::shared_ptr<Kernel::Thread> thread, Kernel::HLERequestContext& ctx,
Kernel::ThreadWakeupReason reason) {
// Repeat TransactParcel DequeueBuffer when a buffer is available
- nv_flinger->Lock();
+ const auto guard = nv_flinger->Lock();
auto& buffer_queue = nv_flinger->FindBufferQueue(id);
auto result = buffer_queue.DequeueBuffer(width, height);
ASSERT_MSG(result != std::nullopt, "Could not dequeue buffer.");