etc/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

service/nvflinger: Make FindBufferQueueId() a const member function

Browse source 
This member function doesn't actually modify instance state, so it can
be const-qualified.
This commit is contained in:
Lioncash 2019-01-30 11:14:05 -05:00
parent 1d11def9c4
commit ba14fb42e4
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/core/hle/service/nvflinger/nvflinger.cpp
View file

@ -73,7 +73,7 @@ u64 NVFlinger::CreateLayer(u64 display_id) {
return layer_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); const auto& layer = FindLayer(display_id, layer_id);
return layer.buffer_queue->GetId(); return layer.buffer_queue->GetId();
} }
@ -98,6 +98,14 @@ Display& NVFlinger::FindDisplay(u64 display_id) {
return *itr; 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) { Layer& NVFlinger::FindLayer(u64 display_id, u64 layer_id) {
auto& display = FindDisplay(display_id); auto& display = FindDisplay(display_id);
@ -108,6 +116,16 @@ Layer& NVFlinger::FindLayer(u64 display_id, u64 layer_id) {
return *itr; 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() { void NVFlinger::Compose() {
for (auto& display : displays) { for (auto& display : displays) {
// Trigger vsync for this display at the end of drawing // Trigger vsync for this display at the end of drawing

8
src/core/hle/service/nvflinger/nvflinger.h
View file

@ -64,7 +64,7 @@ public:
u64 CreateLayer(u64 display_id); u64 CreateLayer(u64 display_id);
/// Finds the buffer queue ID of the specified layer in the specified display. /// Finds the buffer queue ID of the specified layer in the specified display.
u32 FindBufferQueueId(u64 display_id, u64 layer_id); u32 FindBufferQueueId(u64 display_id, u64 layer_id) const;
/// Gets the vsync event for the specified display. /// Gets the vsync event for the specified display.
Kernel::SharedPtr<Kernel::ReadableEvent> GetVsyncEvent(u64 display_id); Kernel::SharedPtr<Kernel::ReadableEvent> GetVsyncEvent(u64 display_id);
@ -80,9 +80,15 @@ private:
/// Finds the display identified by the specified ID. /// Finds the display identified by the specified ID.
Display& FindDisplay(u64 display_id); Display& FindDisplay(u64 display_id);
/// Finds the display identified by the specified ID.
const Display& FindDisplay(u64 display_id) const;
/// Finds the layer identified by the specified ID in the desired display. /// Finds the layer identified by the specified ID in the desired display.
Layer& FindLayer(u64 display_id, u64 layer_id); Layer& FindLayer(u64 display_id, u64 layer_id);
/// Finds the layer identified by the specified ID in the desired display.
const Layer& FindLayer(u64 display_id, u64 layer_id) const;
std::shared_ptr<Nvidia::Module> nvdrv; std::shared_ptr<Nvidia::Module> nvdrv;
std::array<Display, 5> displays{{ std::array<Display, 5> displays{{