summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/acc/acc_su.h6
-rw-r--r--src/core/hle/service/ns/pl_u.cpp6
-rw-r--r--src/core/hle/service/nvflinger/buffer_queue.cpp6
-rw-r--r--src/core/hle/service/nvflinger/buffer_queue.h6
4 files changed, 10 insertions, 14 deletions
diff --git a/src/core/hle/service/acc/acc_su.h b/src/core/hle/service/acc/acc_su.h
index a3eb885bf..fcced063a 100644
--- a/src/core/hle/service/acc/acc_su.h
+++ b/src/core/hle/service/acc/acc_su.h
@@ -6,8 +6,7 @@
6 6
7#include "core/hle/service/acc/acc.h" 7#include "core/hle/service/acc/acc.h"
8 8
9namespace Service { 9namespace Service::Account {
10namespace Account {
11 10
12class ACC_SU final : public Module::Interface { 11class ACC_SU final : public Module::Interface {
13public: 12public:
@@ -16,5 +15,4 @@ public:
16 ~ACC_SU() override; 15 ~ACC_SU() override;
17}; 16};
18 17
19} // namespace Account 18} // namespace Service::Account
20} // namespace Service
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp
index ac0eaaa8f..447689a1a 100644
--- a/src/core/hle/service/ns/pl_u.cpp
+++ b/src/core/hle/service/ns/pl_u.cpp
@@ -253,14 +253,16 @@ PL_U::PL_U() : ServiceFramework("pl:u"), impl{std::make_unique<Impl>()} {
253 LOG_WARNING(Service_NS, 253 LOG_WARNING(Service_NS,
254 "Shared Font file missing. Loading open source replacement from memory"); 254 "Shared Font file missing. Loading open source replacement from memory");
255 255
256 // clang-format off
256 const std::vector<std::vector<u8>> open_source_shared_fonts_ttf = { 257 const std::vector<std::vector<u8>> open_source_shared_fonts_ttf = {
257 {std::begin(FontChineseSimplified), std::end(FontChineseSimplified)}, 258 {std::begin(FontChineseSimplified), std::end(FontChineseSimplified)},
258 {std::begin(FontChineseTraditional), std::end(FontChineseTraditional)}, 259 {std::begin(FontChineseTraditional), std::end(FontChineseTraditional)},
259 {std::begin(FontExtendedChineseSimplified), 260 {std::begin(FontExtendedChineseSimplified), std::end(FontExtendedChineseSimplified)},
260 std::end(FontExtendedChineseSimplified)}, 261 {std::begin(FontKorean), std::end(FontKorean)},
261 {std::begin(FontNintendoExtended), std::end(FontNintendoExtended)}, 262 {std::begin(FontNintendoExtended), std::end(FontNintendoExtended)},
262 {std::begin(FontStandard), std::end(FontStandard)}, 263 {std::begin(FontStandard), std::end(FontStandard)},
263 }; 264 };
265 // clang-format on
264 266
265 for (const std::vector<u8>& font_ttf : open_source_shared_fonts_ttf) { 267 for (const std::vector<u8>& font_ttf : open_source_shared_fonts_ttf) {
266 const FontRegion region{static_cast<u32>(offset + 8), 268 const FontRegion region{static_cast<u32>(offset + 8),
diff --git a/src/core/hle/service/nvflinger/buffer_queue.cpp b/src/core/hle/service/nvflinger/buffer_queue.cpp
index 34f98fe5a..fd98d541d 100644
--- a/src/core/hle/service/nvflinger/buffer_queue.cpp
+++ b/src/core/hle/service/nvflinger/buffer_queue.cpp
@@ -9,8 +9,7 @@
9#include "core/core.h" 9#include "core/core.h"
10#include "core/hle/service/nvflinger/buffer_queue.h" 10#include "core/hle/service/nvflinger/buffer_queue.h"
11 11
12namespace Service { 12namespace Service::NVFlinger {
13namespace NVFlinger {
14 13
15BufferQueue::BufferQueue(u32 id, u64 layer_id) : id(id), layer_id(layer_id) { 14BufferQueue::BufferQueue(u32 id, u64 layer_id) : id(id), layer_id(layer_id) {
16 auto& kernel = Core::System::GetInstance().Kernel(); 15 auto& kernel = Core::System::GetInstance().Kernel();
@@ -104,5 +103,4 @@ u32 BufferQueue::Query(QueryType type) {
104 return 0; 103 return 0;
105} 104}
106 105
107} // namespace NVFlinger 106} // namespace Service::NVFlinger
108} // namespace Service
diff --git a/src/core/hle/service/nvflinger/buffer_queue.h b/src/core/hle/service/nvflinger/buffer_queue.h
index 17c81928a..50b767732 100644
--- a/src/core/hle/service/nvflinger/buffer_queue.h
+++ b/src/core/hle/service/nvflinger/buffer_queue.h
@@ -15,8 +15,7 @@ namespace CoreTiming {
15struct EventType; 15struct EventType;
16} 16}
17 17
18namespace Service { 18namespace Service::NVFlinger {
19namespace NVFlinger {
20 19
21struct IGBPBuffer { 20struct IGBPBuffer {
22 u32_le magic; 21 u32_le magic;
@@ -98,5 +97,4 @@ private:
98 Kernel::SharedPtr<Kernel::Event> buffer_wait_event; 97 Kernel::SharedPtr<Kernel::Event> buffer_wait_event;
99}; 98};
100 99
101} // namespace NVFlinger 100} // namespace Service::NVFlinger
102} // namespace Service