From 110d32729ecbe5b19df9b2cc76de630334410589 Mon Sep 17 00:00:00 2001 From: mitaclaw <140017135+mitaclaw@users.noreply.github.com> Date: Fri, 20 Sep 2024 22:17:29 -0700 Subject: Simplify `std::find` with `Common::Contains` In NandPaths.cpp, the `std::initializer_list` of illegal characters has been turned into a `char[]` (similar to the one in GameList.cpp). The reverse iteration in ResourcePack.cpp seemed to provide no benefits, and doing without it it seemed to have no ill effects. --- Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoCommon/GraphicsModSystem') diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.cpp index 473cc06690..0001a9081d 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.cpp @@ -7,6 +7,7 @@ #include #include +#include "Common/Contains.h" #include "Common/Logging/Log.h" #include "Common/VariantUtil.h" @@ -20,7 +21,7 @@ bool IsQualifier(std::string_view value) static constexpr std::array qualifiers = { "attribute", "const", "highp", "lowp", "mediump", "uniform", "varying", }; - return std::find(qualifiers.begin(), qualifiers.end(), value) != qualifiers.end(); + return Common::Contains(qualifiers, value); } bool IsBuiltInMacro(std::string_view value) @@ -28,7 +29,7 @@ bool IsBuiltInMacro(std::string_view value) static constexpr std::array built_in = { "__LINE__", "__FILE__", "__VERSION__", "GL_core_profile", "GL_compatibility_profile", }; - return std::find(built_in.begin(), built_in.end(), value) != built_in.end(); + return Common::Contains(built_in, value); } std::vector GlobalConflicts(std::string_view source) -- cgit v1.2.3