From d4ad55ed21047747698618e97dfa727d454c3c96 Mon Sep 17 00:00:00 2001 From: Zephyron Date: Sun, 9 Feb 2025 12:07:50 +1000 Subject: [PATCH] Replace yuzu identifiers with citron Update magic numbers and default identifiers across codebase: - UUID default value - Thread magic number - Amiibo name - Vulkan cache magic number - Shader cache magic number --- src/common/uuid.h | 2 +- src/core/hle/kernel/k_thread.h | 2 +- src/core/hle/service/nfc/common/device.cpp | 2 +- src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 2 +- src/video_core/shader_environment.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/uuid.h b/src/common/uuid.h index 042f00de9..f58ceee49 100644 --- a/src/common/uuid.h +++ b/src/common/uuid.h @@ -82,7 +82,7 @@ struct UUID { */ static constexpr UUID MakeDefault() { return UUID{ - {'y', 'u', 'z', 'u', ' ', 'D', 'e', 'f', 'a', 'u', 'l', 't', ' ', 'U', 'I', 'D'}, + {'c', 'i', 't', 'r', ' ', '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 e928cfebc..3bb1dd8f1 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 lock{1}; bool is_running{}; - u32 magic{Common::MakeMagic('Y', 'U', 'Z', 'U')}; + u32 magic{Common::MakeMagic('C', 'I', 'T', 'R')}; }; NativeExecutionParameters& GetNativeExecutionParameters() { diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp index 1b898672e..18aa0ae35 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, {'y', 'u', 'z', 'u', 'A', 'm', 'i', 'i', 'b', 'o'}); + SetAmiiboName(settings, {'c', 'i', 't', 'r', '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 632640e34..cb3d0ec8f 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 VULKAN_CACHE_MAGIC_NUMBER{'y', 'u', 'z', 'u', 'v', 'k', 'c', 'h'}; +constexpr std::array VULKAN_CACHE_MAGIC_NUMBER{'c', 'i', 't', 'r', 'v', 'k', 'c', 'h'}; template auto MakeSpan(Container& container) { diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp index 57b534804..935e046a9 100644 --- a/src/video_core/shader_environment.cpp +++ b/src/video_core/shader_environment.cpp @@ -25,7 +25,7 @@ namespace VideoCommon { -constexpr std::array MAGIC_NUMBER{'y', 'u', 'z', 'u', 'c', 'a', 'c', 'h'}; +constexpr std::array MAGIC_NUMBER{'c', 'i', 't', 'r', 'c', 'a', 'c', 'h'}; constexpr size_t INST_SIZE = sizeof(u64);