From b292022bc7ac424ed00dd606b5f18ee32b9b576a Mon Sep 17 00:00:00 2001 From: iwubcode Date: Mon, 16 Oct 2023 19:23:00 -0500 Subject: [PATCH] VideoCommon: use ToLower function in assets when parsing json, for proper locale independent behavior --- Source/Core/VideoCommon/Assets/ShaderAsset.cpp | 4 ++-- Source/Core/VideoCommon/Assets/TextureAsset.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Source/Core/VideoCommon/Assets/ShaderAsset.cpp b/Source/Core/VideoCommon/Assets/ShaderAsset.cpp index f71ed65ff7..e58b9bfbb6 100644 --- a/Source/Core/VideoCommon/Assets/ShaderAsset.cpp +++ b/Source/Core/VideoCommon/Assets/ShaderAsset.cpp @@ -9,6 +9,7 @@ #include #include "Common/Logging/Log.h" +#include "Common/StringUtil.h" #include "VideoCommon/Assets/CustomAssetLibrary.h" namespace VideoCommon @@ -47,8 +48,7 @@ bool ParseShaderProperties(const VideoCommon::CustomAssetLibrary::AssetID& asset return false; } std::string type = type_iter->second.to_str(); - std::transform(type.begin(), type.end(), type.begin(), - [](unsigned char c) { return std::tolower(c); }); + Common::ToLower(&type); static constexpr std::array, static_cast(ShaderProperty::Type::Type_Max)> diff --git a/Source/Core/VideoCommon/Assets/TextureAsset.cpp b/Source/Core/VideoCommon/Assets/TextureAsset.cpp index 9418add8d1..484e89c19d 100644 --- a/Source/Core/VideoCommon/Assets/TextureAsset.cpp +++ b/Source/Core/VideoCommon/Assets/TextureAsset.cpp @@ -4,6 +4,7 @@ #include "VideoCommon/Assets/TextureAsset.h" #include "Common/Logging/Log.h" +#include "Common/StringUtil.h" #include "VideoCommon/BPMemory.h" namespace VideoCommon @@ -31,8 +32,7 @@ bool ParseSampler(const VideoCommon::CustomAssetLibrary::AssetID& asset_id, return false; } std::string sampler_state_mode = sampler_state_mode_iter->second.to_str(); - std::transform(sampler_state_mode.begin(), sampler_state_mode.end(), sampler_state_mode.begin(), - [](unsigned char c) { return std::tolower(c); }); + Common::ToLower(&sampler_state_mode); if (sampler_state_mode == "clamp") { @@ -71,8 +71,7 @@ bool ParseSampler(const VideoCommon::CustomAssetLibrary::AssetID& asset_id, return false; } std::string sampler_state_filter = sampler_state_filter_iter->second.to_str(); - std::transform(sampler_state_filter.begin(), sampler_state_filter.end(), - sampler_state_filter.begin(), [](unsigned char c) { return std::tolower(c); }); + Common::ToLower(&sampler_state_filter); if (sampler_state_filter == "linear") { sampler->tm0.min_filter = FilterMode::Linear; @@ -116,8 +115,7 @@ bool TextureData::FromJson(const CustomAssetLibrary::AssetID& asset_id, return false; } std::string type = type_iter->second.to_str(); - std::transform(type.begin(), type.end(), type.begin(), - [](unsigned char c) { return std::tolower(c); }); + Common::ToLower(&type); if (type == "texture2d") {