Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 07:35:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PostProcessing/FX: Preserve option declaration order

Browse source
This commit is contained in:
Stenzek 2024-07-26 15:29:49 +10:00
parent bf1b023f12
commit 3282366ea7
No known key found for this signature in database
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/util/postprocessing_shader.h
View file

@ -54,12 +54,14 @@ public:
u32 target_height) = 0; u32 target_height) = 0;
protected: protected:
using OptionList = std::vector<ShaderOption>;
static void ParseKeyValue(std::string_view line, std::string_view* key, std::string_view* value); static void ParseKeyValue(std::string_view line, std::string_view* key, std::string_view* value);
virtual void OnOptionChanged(const ShaderOption& option); virtual void OnOptionChanged(const ShaderOption& option);
std::string m_name; std::string m_name;
std::vector<ShaderOption> m_options; OptionList m_options;
}; };
} // namespace PostProcessing } // namespace PostProcessing

14
src/util/postprocessing_shader_fx.cpp
View file

@ -746,13 +746,17 @@ bool PostProcessing::ReShadeFXShader::CreateOptions(const reshadefx::module& mod
} }
} }
m_options.push_back(std::move(opt)); OptionList::iterator iter = std::find_if(m_options.begin(), m_options.end(),
[&opt](const ShaderOption& it) { return it.category == opt.category; });
if (iter != m_options.end())
{
// insert at the end of this category
while (iter != m_options.end() && iter->category == opt.category)
++iter;
}
m_options.insert(iter, std::move(opt));
} }
// sort based on category
std::sort(m_options.begin(), m_options.end(),
[](const ShaderOption& lhs, const ShaderOption& rhs) { return lhs.category < rhs.category; });
m_uniforms_size = mod.total_uniform_size; m_uniforms_size = mod.total_uniform_size;
DEV_LOG("{}: {} options", m_filename, m_options.size()); DEV_LOG("{}: {} options", m_filename, m_options.size());
return true; return true;