summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-07-19 14:18:29 -0700
committerGitHub <noreply@github.com>2018-07-19 14:18:29 -0700
commit724467113736bedd80cdaebad9966be4bfba29bb (patch)
tree0d6819ded33adfb967fcb006830a57d9ee7ed8f4 /src
parenteb9b55eafe822b1f14b298969c10aa6047e432af (diff)
parentf3daecafeb532e830dc7f0643bf8ad84473b3f8b (diff)
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
NVFlinger::NVFlinger() {
// Add the different displays to the list of displays.
- Display default_{0, "Default"};
- Display external{1, "External"};
- Display edid{2, "Edid"};
- Display internal{3, "Internal"};
-
- displays.emplace_back(default_);
- displays.emplace_back(external);
- displays.emplace_back(edid);
- displays.emplace_back(internal);
+ displays.emplace_back(0, "Default");
+ displays.emplace_back(1, "External");
+ displays.emplace_back(2, "Edid");
+ displays.emplace_back(3, "Internal");
// Schedule the screen composition events
composition_event =