Browse Source
Merge pull request #716 from lioncash/construct
nvflinger: Emplace Display instances directly
pull/15/merge
bunnei
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
9 deletions
-
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 = |
|
|
|
|
