diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-01-29 20:48:31 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-01-30 03:13:33 +0100 |
| commit | f45c25aabacc70861723a7ca1096a677bd987487 (patch) | |
| tree | b3e19530caf4c1f1f6c6e3f2c0697051f50a55d1 | |
| parent | hle/ipc_helpers: Fix clang-format warnings (diff) | |
| download | yuzu-f45c25aabacc70861723a7ca1096a677bd987487.tar yuzu-f45c25aabacc70861723a7ca1096a677bd987487.tar.gz yuzu-f45c25aabacc70861723a7ca1096a677bd987487.tar.bz2 yuzu-f45c25aabacc70861723a7ca1096a677bd987487.tar.lz yuzu-f45c25aabacc70861723a7ca1096a677bd987487.tar.xz yuzu-f45c25aabacc70861723a7ca1096a677bd987487.tar.zst yuzu-f45c25aabacc70861723a7ca1096a677bd987487.zip | |
| -rw-r--r-- | src/core/hle/service/nvflinger/nvflinger.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/nvflinger/nvflinger.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp index 6a613aeab..5bc0d74e8 100644 --- a/src/core/hle/service/nvflinger/nvflinger.cpp +++ b/src/core/hle/service/nvflinger/nvflinger.cpp @@ -30,12 +30,6 @@ constexpr std::size_t SCREEN_REFRESH_RATE = 60; constexpr u64 frame_ticks = static_cast<u64>(CoreTiming::BASE_CLOCK_RATE / SCREEN_REFRESH_RATE); NVFlinger::NVFlinger() { - // Add the different displays to the list of displays. - 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 = CoreTiming::RegisterEvent("ScreenComposition", [this](u64 userdata, int cycles_late) { diff --git a/src/core/hle/service/nvflinger/nvflinger.h b/src/core/hle/service/nvflinger/nvflinger.h index 9abba555b..5ba64a4ce 100644 --- a/src/core/hle/service/nvflinger/nvflinger.h +++ b/src/core/hle/service/nvflinger/nvflinger.h @@ -4,6 +4,7 @@ #pragma once +#include <array> #include <memory> #include <string> #include <string_view> @@ -84,7 +85,12 @@ private: std::shared_ptr<Nvidia::Module> nvdrv; - std::vector<Display> displays; + std::array<Display, 4> displays{{ + {0, "Default"}, + {1, "External"}, + {2, "Edid"}, + {3, "Internal"}, + }}; std::vector<std::shared_ptr<BufferQueue>> buffer_queues; /// Id to use for the next layer that is created, this counter is shared among all displays. |