etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-12-02 16:17:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

gfx/shader: De-duplicate some code paths

Browse source 
Co-authored-by: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
This commit is contained in:
coolsoft.rf 2021-10-15 17:30:01 +03:00 committed by Michael Fabian 'Xaymar' Dirks
parent c5e69e4076
commit 6aa3f6dbc2
1 changed files with 22 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
source/gfx/shader/gfx-shader.cpp
View file

@ -140,44 +140,32 @@ try {
auto etech = _shader.get_technique(_shader_tech); auto etech = _shader.get_technique(_shader_tech);
for (std::size_t idx = 0; idx < etech.count_passes(); idx++) { for (std::size_t idx = 0; idx < etech.count_passes(); idx++) {
auto pass = etech.get_pass(idx); auto pass = etech.get_pass(idx);
auto fetch_params = [&](std::size_t count,
for (std::size_t vidx = 0; vidx < pass.count_vertex_parameters(); vidx++) { std::function<streamfx::obs::gs::effect_parameter(std::size_t)> get_func) {
auto el = pass.get_vertex_parameter(vidx); for (std::size_t vidx = 0; vidx < count; vidx++) {
auto el = get_func(vidx);
if (!el) if (!el)
continue; continue;
auto fnd = _shader_params.find(el.get_name()); auto el_name = el.get_name();
auto fnd = _shader_params.find(el_name);
if (fnd != _shader_params.end()) if (fnd != _shader_params.end())
continue; continue;
auto param = streamfx::gfx::shader::parameter::make_parameter(el, ST_KEY_PARAMETERS); auto param = streamfx::gfx::shader::parameter::make_parameter(el, ST_KEY_PARAMETERS);
if (param) { if (param) {
_shader_params.insert_or_assign(el.get_name(), param); _shader_params.insert_or_assign(el_name, param);
param->defaults(settings.get()); param->defaults(settings.get());
param->update(settings.get()); param->update(settings.get());
} }
} }
};
for (std::size_t vidx = 0; vidx < pass.count_pixel_parameters(); vidx++) { auto gvp = [&](std::size_t idx) { return pass.get_vertex_parameter(idx); };
auto el = pass.get_pixel_parameter(vidx); fetch_params(pass.count_vertex_parameters(), gvp);
auto gpp = [&](std::size_t idx) { return pass.get_pixel_parameter(idx); };
if (!el) fetch_params(pass.count_pixel_parameters(), gpp);
continue;
auto fnd = _shader_params.find(el.get_name());
if (fnd != _shader_params.end())
continue;
auto param = streamfx::gfx::shader::parameter::make_parameter(el, ST_KEY_PARAMETERS);
if (param) {
_shader_params.insert_or_assign(el.get_name(), param);
param->defaults(settings.get());
param->update(settings.get());
}
}
} }
} }
@ -383,12 +371,6 @@ uint32_t streamfx::gfx::shader::shader::width()
case shader_mode::Transition: case shader_mode::Transition:
return _base_width; return _base_width;
case shader_mode::Source: case shader_mode::Source:
switch (_width_type) {
case size_type::Pixel:
return std::clamp(static_cast<uint32_t>(_width_value), 1u, 16384u);
case size_type::Percent:
return std::clamp(static_cast<uint32_t>(_width_value * _base_width), 1u, 16384u);
}
case shader_mode::Filter: case shader_mode::Filter:
switch (_width_type) { switch (_width_type) {
case size_type::Pixel: case size_type::Pixel:
@ -407,12 +389,6 @@ uint32_t streamfx::gfx::shader::shader::height()
case shader_mode::Transition: case shader_mode::Transition:
return _base_height; return _base_height;
case shader_mode::Source: case shader_mode::Source:
switch (_height_type) {
case size_type::Pixel:
return std::clamp(static_cast<uint32_t>(_height_value), 1u, 16384u);
case size_type::Percent:
return std::clamp(static_cast<uint32_t>(_height_value * _base_height), 1u, 16384u);
}
case shader_mode::Filter: case shader_mode::Filter:
switch (_height_type) { switch (_height_type) {
case size_type::Pixel: case size_type::Pixel: