summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZephyron <zephyron@citron-emu.org>2025-02-09 18:19:08 +1000
committerZephyron <zephyron@citron-emu.org>2025-02-09 18:19:08 +1000
commitdcf6f9a071baa3b3a245cf810ea26ab15e45b568 (patch)
tree99e49eb02c3654f4449e599b36ce33182913f74e /src
parentb42a0fb227c15a706fd1a7e4fc8a4e18a93ded94 (diff)
Revert "Replace yuzu identifiers with citron"
This reverts commit d4ad55ed21047747698618e97dfa727d454c3c96.
Diffstat (limited to 'src')
-rw-r--r--src/common/uuid.h2
-rw-r--r--src/core/hle/kernel/k_thread.h2
-rw-r--r--src/core/hle/service/nfc/common/device.cpp2
-rw-r--r--src/video_core/renderer_vulkan/vk_pipeline_cache.cpp2
-rw-r--r--src/video_core/shader_environment.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/common/uuid.h b/src/common/uuid.h
index f58ceee49..042f00de9 100644
--- a/src/common/uuid.h
+++ b/src/common/uuid.h
@@ -82,7 +82,7 @@ struct UUID {
*/
static constexpr UUID MakeDefault() {
return UUID{
- {'c', 'i', 't', 'r', ' ', 'D', 'e', 'f', 'a', 'u', 'l', 't', ' ', 'U', 'I', 'D'},
+ {'y', 'u', 'z', 'u', ' ', 'D', 'e', 'f', 'a', 'u', 'l', 't', ' ', 'U', 'I', 'D'},
};
}
diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h
index 3bb1dd8f1..e928cfebc 100644
--- a/src/core/hle/kernel/k_thread.h
+++ b/src/core/hle/kernel/k_thread.h
@@ -656,7 +656,7 @@ public:
void* native_context{};
std::atomic<u32> lock{1};
bool is_running{};
- u32 magic{Common::MakeMagic('C', 'I', 'T', 'R')};
+ u32 magic{Common::MakeMagic('Y', 'U', 'Z', 'U')};
};
NativeExecutionParameters& GetNativeExecutionParameters() {
diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp
index 18aa0ae35..1b898672e 100644
--- a/src/core/hle/service/nfc/common/device.cpp
+++ b/src/core/hle/service/nfc/common/device.cpp
@@ -1494,7 +1494,7 @@ void NfcDevice::BuildAmiiboWithoutKeys(NFP::NTAG215File& stubbed_tag_data,
settings.write_date = GetAmiiboDate(GetCurrentPosixTime());
// Register info
- SetAmiiboName(settings, {'c', 'i', 't', 'r', 'A', 'm', 'i', 'i', 'b', 'o'});
+ SetAmiiboName(settings, {'y', 'u', 'z', 'u', 'A', 'm', 'i', 'i', 'b', 'o'});
settings.settings.font_region.Assign(0);
settings.init_date = GetAmiiboDate(GetCurrentPosixTime());
store_data.BuildBase(Mii::Gender::Male);
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index cb3d0ec8f..632640e34 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -54,7 +54,7 @@ using VideoCommon::GenericEnvironment;
using VideoCommon::GraphicsEnvironment;
constexpr u32 CACHE_VERSION = 11;
-constexpr std::array<char, 8> VULKAN_CACHE_MAGIC_NUMBER{'c', 'i', 't', 'r', 'v', 'k', 'c', 'h'};
+constexpr std::array<char, 8> VULKAN_CACHE_MAGIC_NUMBER{'y', 'u', 'z', 'u', 'v', 'k', 'c', 'h'};
template <typename Container>
auto MakeSpan(Container& container) {
diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp
index 935e046a9..57b534804 100644
--- a/src/video_core/shader_environment.cpp
+++ b/src/video_core/shader_environment.cpp
@@ -25,7 +25,7 @@
namespace VideoCommon {
-constexpr std::array<char, 8> MAGIC_NUMBER{'c', 'i', 't', 'r', 'c', 'a', 'c', 'h'};
+constexpr std::array<char, 8> MAGIC_NUMBER{'y', 'u', 'z', 'u', 'c', 'a', 'c', 'h'};
constexpr size_t INST_SIZE = sizeof(u64);