summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-07-19 14:18:29 -0700
committerGravatar GitHub2018-07-19 14:18:29 -0700
commit724467113736bedd80cdaebad9966be4bfba29bb (patch)
tree0d6819ded33adfb967fcb006830a57d9ee7ed8f4 /src
parentMerge pull request #715 from lioncash/const-ref (diff)
parentnvflinger: Emplace Display instances directly (diff)
downloadyuzu-724467113736bedd80cdaebad9966be4bfba29bb.tar.gz
yuzu-724467113736bedd80cdaebad9966be4bfba29bb.tar.xz
yuzu-724467113736bedd80cdaebad9966be4bfba29bb.zip
Merge pull request #716 from lioncash/construct
nvflinger: Emplace Display instances directly
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp
index d580f779e..1fca1743d 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvflinger/nvflinger.cpp
@@ -23,15 +23,10 @@ constexpr u64 frame_ticks = static_cast<u64>(CoreTiming::BASE_CLOCK_RATE / SCREE
23 23
24NVFlinger::NVFlinger() { 24NVFlinger::NVFlinger() {
25 // Add the different displays to the list of displays. 25 // Add the different displays to the list of displays.
26 Display default_{0, "Default"}; 26 displays.emplace_back(0, "Default");
27 Display external{1, "External"}; 27 displays.emplace_back(1, "External");
28 Display edid{2, "Edid"}; 28 displays.emplace_back(2, "Edid");
29 Display internal{3, "Internal"}; 29 displays.emplace_back(3, "Internal");
30
31 displays.emplace_back(default_);
32 displays.emplace_back(external);
33 displays.emplace_back(edid);
34 displays.emplace_back(internal);
35 30
36 // Schedule the screen composition events 31 // Schedule the screen composition events
37 composition_event = 32 composition_event =