From 86910f406e3680c4cb01f37e5f29f894a25342cb Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 16 Aug 2023 09:54:24 +0200 Subject: VideoCommon: Fix std::filesystem::path encoding conversion In std::string, you can store strings using any encoding, but in Dolphin we have decided to use UTF-8. The problem is that if you convert between std::string and std::filesystem::path using the built-in methods, the standard library will make up its own assumption of what encoding you're using in the std::string. On most OSes this is UTF-8, but on Windows it's whatever the user's code page is. What I believe is the C++ standard authors' intended solution to this is to use std::u8string instead of std::string, but that's a big hassle to move over to, because there's no convenient way to convert between std::string and std::u8string. Instead, in Dolphin, we have added helper functions that convert between std::string and std::filesystem::path in the manner we want. You *always* have to use these when converting between std::string and std::filesystem::path, otherwise we get these kinds of encoding problems that we've been having with custom textures. Fixes https://bugs.dolphin-emu.org/issues/13328. --- Source/Core/VideoCommon/HiresTextures.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/HiresTextures.cpp') diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index f9f3134e35..6a489973a5 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -131,7 +131,7 @@ void HiresTexture::Update() // Since this is just a texture (single file) the mapper doesn't really matter // just provide a string s_file_library->SetAssetIDMapData( - filename, std::map{{"", path}}); + filename, std::map{{"", StringToPath(path)}}); if (g_ActiveConfig.bCacheHiresTextures) { -- cgit v1.2.3