summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/nvflinger
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2021-04-26 15:11:33 +0200
committerLioncash <mathew1800@gmail.com>2021-04-26 15:39:49 +0200
commitdcb91ca4a4a97d279d01ebe010e07298acca1ba9 (patch)
tree873cdb75aadc3be02c833c205d8e37c375fa49dd /src/core/hle/service/nvflinger
parentMerge pull request #6198 from Kewlan/favorite-games (diff)
downloadyuzu-dcb91ca4a4a97d279d01ebe010e07298acca1ba9.tar
yuzu-dcb91ca4a4a97d279d01ebe010e07298acca1ba9.tar.gz
yuzu-dcb91ca4a4a97d279d01ebe010e07298acca1ba9.tar.bz2
yuzu-dcb91ca4a4a97d279d01ebe010e07298acca1ba9.tar.lz
yuzu-dcb91ca4a4a97d279d01ebe010e07298acca1ba9.tar.xz
yuzu-dcb91ca4a4a97d279d01ebe010e07298acca1ba9.tar.zst
yuzu-dcb91ca4a4a97d279d01ebe010e07298acca1ba9.zip
Diffstat (limited to 'src/core/hle/service/nvflinger')
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp
index 539b02bc4..c43593e7f 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvflinger/nvflinger.cpp
@@ -72,7 +72,7 @@ NVFlinger::NVFlinger(Core::System& system) : system(system) {
// Schedule the screen composition events
composition_event = Core::Timing::CreateEvent(
"ScreenComposition", [this](std::uintptr_t, std::chrono::nanoseconds ns_late) {
- const auto guard = Lock();
+ const auto lock_guard = Lock();
Compose();
const auto ticks = std::chrono::nanoseconds{GetNextTicks()};
@@ -112,7 +112,7 @@ void NVFlinger::SetNVDrvInstance(std::shared_ptr<Nvidia::Module> instance) {
}
std::optional<u64> NVFlinger::OpenDisplay(std::string_view name) {
- const auto guard = Lock();
+ const auto lock_guard = Lock();
LOG_DEBUG(Service, "Opening \"{}\" display", name);
@@ -131,7 +131,7 @@ std::optional<u64> NVFlinger::OpenDisplay(std::string_view name) {
}
std::optional<u64> NVFlinger::CreateLayer(u64 display_id) {
- const auto guard = Lock();
+ const auto lock_guard = Lock();
auto* const display = FindDisplay(display_id);
if (display == nullptr) {
@@ -147,7 +147,7 @@ std::optional<u64> NVFlinger::CreateLayer(u64 display_id) {
}
void NVFlinger::CloseLayer(u64 layer_id) {
- const auto guard = Lock();
+ const auto lock_guard = Lock();
for (auto& display : displays) {
display.CloseLayer(layer_id);
@@ -155,7 +155,7 @@ void NVFlinger::CloseLayer(u64 layer_id) {
}
std::optional<u32> NVFlinger::FindBufferQueueId(u64 display_id, u64 layer_id) const {
- const auto guard = Lock();
+ const auto lock_guard = Lock();
const auto* const layer = FindLayer(display_id, layer_id);
if (layer == nullptr) {
@@ -166,7 +166,7 @@ std::optional<u32> NVFlinger::FindBufferQueueId(u64 display_id, u64 layer_id) co
}
std::shared_ptr<Kernel::KReadableEvent> NVFlinger::FindVsyncEvent(u64 display_id) const {
- const auto guard = Lock();
+ const auto lock_guard = Lock();
auto* const display = FindDisplay(display_id);
if (display == nullptr) {
@@ -177,7 +177,7 @@ std::shared_ptr<Kernel::KReadableEvent> NVFlinger::FindVsyncEvent(u64 display_id
}
BufferQueue* NVFlinger::FindBufferQueue(u32 id) {
- const auto guard = Lock();
+ const auto lock_guard = Lock();
const auto itr = std::find_if(buffer_queues.begin(), buffer_queues.end(),
[id](const auto& queue) { return queue->GetId() == id; });