etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-10 22:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

filter-shader: Fix blending

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2019-08-07 19:20:32 +02:00
parent 90699f6b6f
commit 7fdd9498a0
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/filters/filter-shader.cpp
View file

@ -178,6 +178,7 @@ filter::shader::shader_instance::shader_instance(obs_data_t* data, obs_source_t*
_fx->set_override_cb(std::bind(&filter::shader::shader_instance::override_param, this, std::placeholders::_1)); _fx->set_override_cb(std::bind(&filter::shader::shader_instance::override_param, this, std::placeholders::_1));
_rt = std::make_shared<gs::rendertarget>(GS_RGBA, GS_ZS_NONE); _rt = std::make_shared<gs::rendertarget>(GS_RGBA, GS_ZS_NONE);
_rt2 = std::make_shared<gs::rendertarget>(GS_RGBA, GS_ZS_NONE);
update(data); update(data);
} }
@ -258,6 +259,7 @@ void filter::shader::shader_instance::video_tick(float_t sec_since_last)
} }
_rt_updated = false; _rt_updated = false;
_rt2_updated = false;
} }
void filter::shader::shader_instance::video_render(gs_effect_t* effect) void filter::shader::shader_instance::video_render(gs_effect_t* effect)
@ -292,9 +294,25 @@ void filter::shader::shader_instance::video_render(gs_effect_t* effect)
_rt_updated = true; _rt_updated = true;
} }
try { if (!_rt2_updated) {
_fx->render(); try {
} catch (...) { auto op = _rt2->render(_width, _height);
obs_source_skip_video_filter(_self); _fx->render();
} catch (...) {
obs_source_skip_video_filter(_self);
}
_rt2_tex = _rt2->get_texture();
_rt2_updated = true;
}
if (!_rt2_tex)
return;
gs_effect_t* ef = effect ? effect : effect_default;
if (gs_eparam_t* prm = gs_effect_get_param_by_name(ef, "image"))
gs_effect_set_texture(prm, _rt2_tex->get_object());
while (gs_effect_loop(ef, "Draw")) {
gs_draw_sprite(nullptr, 0, _width, _height);
} }
} }

4
source/filters/filter-shader.hpp
View file

@ -52,6 +52,10 @@ namespace filter {
bool _rt_updated; bool _rt_updated;
std::shared_ptr<gs::texture> _rt_tex; std::shared_ptr<gs::texture> _rt_tex;
std::shared_ptr<gs::rendertarget> _rt2;
bool _rt2_updated;
std::shared_ptr<gs::texture> _rt2_tex;
std::shared_ptr<gfx::effect_source::effect_source> _fx; std::shared_ptr<gfx::effect_source::effect_source> _fx;
public: public: