From c5fa470ad82fd9f58991a3a25326677007035e4c Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 20 Jun 2017 21:24:26 -0700 Subject: replace DoFileSearch with optimized version --- Source/Core/VideoCommon/HiresTextures.cpp | 2 +- Source/Core/VideoCommon/PostProcessing.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon') diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index 7b4a1d387c..36b170ef10 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -97,7 +97,7 @@ void HiresTexture::Update() }; std::vector filenames = - Common::DoFileSearch(extensions, {texture_directory}, /*recursive*/ true); + Common::DoFileSearch({texture_directory}, extensions, /*recursive*/ true); const std::string code = game_id + "_"; diff --git a/Source/Core/VideoCommon/PostProcessing.cpp b/Source/Core/VideoCommon/PostProcessing.cpp index 71f38732e7..0575402dd1 100644 --- a/Source/Core/VideoCommon/PostProcessing.cpp +++ b/Source/Core/VideoCommon/PostProcessing.cpp @@ -31,8 +31,9 @@ PostProcessingShaderImplementation::~PostProcessingShaderImplementation() static std::vector GetShaders(const std::string& sub_dir = "") { std::vector paths = - Common::DoFileSearch({".glsl"}, {File::GetUserPath(D_SHADERS_IDX) + sub_dir, - File::GetSysDirectory() + SHADERS_DIR DIR_SEP + sub_dir}); + Common::DoFileSearch({File::GetUserPath(D_SHADERS_IDX) + sub_dir, + File::GetSysDirectory() + SHADERS_DIR DIR_SEP + sub_dir}, + {".glsl"}); std::vector result; for (std::string path : paths) { -- cgit v1.2.3