From ba14fb42e4a7695c724bcbf05761a20be500d727 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 30 Jan 2019 11:14:05 -0500 Subject: service/nvflinger: Make FindBufferQueueId() a const member function This member function doesn't actually modify instance state, so it can be const-qualified. --- src/core/hle/service/nvflinger/nvflinger.cpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'src/core/hle/service/nvflinger/nvflinger.cpp') diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp index 8e2e6b670..8dfc0df03 100644 --- a/src/core/hle/service/nvflinger/nvflinger.cpp +++ b/src/core/hle/service/nvflinger/nvflinger.cpp @@ -73,7 +73,7 @@ u64 NVFlinger::CreateLayer(u64 display_id) { return layer_id; } -u32 NVFlinger::FindBufferQueueId(u64 display_id, u64 layer_id) { +u32 NVFlinger::FindBufferQueueId(u64 display_id, u64 layer_id) const { const auto& layer = FindLayer(display_id, layer_id); return layer.buffer_queue->GetId(); } @@ -98,6 +98,14 @@ Display& NVFlinger::FindDisplay(u64 display_id) { return *itr; } +const Display& NVFlinger::FindDisplay(u64 display_id) const { + const auto itr = std::find_if(displays.begin(), displays.end(), + [&](const Display& display) { return display.id == display_id; }); + + ASSERT(itr != displays.end()); + return *itr; +} + Layer& NVFlinger::FindLayer(u64 display_id, u64 layer_id) { auto& display = FindDisplay(display_id); @@ -108,6 +116,16 @@ Layer& NVFlinger::FindLayer(u64 display_id, u64 layer_id) { return *itr; } +const Layer& NVFlinger::FindLayer(u64 display_id, u64 layer_id) const { + const auto& display = FindDisplay(display_id); + + const auto itr = std::find_if(display.layers.begin(), display.layers.end(), + [&](const Layer& layer) { return layer.id == layer_id; }); + + ASSERT(itr != display.layers.end()); + return *itr; +} + void NVFlinger::Compose() { for (auto& display : displays) { // Trigger vsync for this display at the end of drawing -- cgit v1.2.3