From 7fdd9498a0ef794ba7518e413f5ab64e2f2a4b79 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Wed, 7 Aug 2019 19:20:32 +0200 Subject: [PATCH] filter-shader: Fix blending --- source/filters/filter-shader.cpp | 26 ++++++++++++++++++++++---- source/filters/filter-shader.hpp | 4 ++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/source/filters/filter-shader.cpp b/source/filters/filter-shader.cpp index 81799475..998bbe60 100644 --- a/source/filters/filter-shader.cpp +++ b/source/filters/filter-shader.cpp @@ -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)); _rt = std::make_shared(GS_RGBA, GS_ZS_NONE); + _rt2 = std::make_shared(GS_RGBA, GS_ZS_NONE); update(data); } @@ -258,6 +259,7 @@ void filter::shader::shader_instance::video_tick(float_t sec_since_last) } _rt_updated = false; + _rt2_updated = false; } 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; } - try { - _fx->render(); - } catch (...) { - obs_source_skip_video_filter(_self); + if (!_rt2_updated) { + try { + auto op = _rt2->render(_width, _height); + _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); } } diff --git a/source/filters/filter-shader.hpp b/source/filters/filter-shader.hpp index 614f0879..0152d39a 100644 --- a/source/filters/filter-shader.hpp +++ b/source/filters/filter-shader.hpp @@ -52,6 +52,10 @@ namespace filter { bool _rt_updated; std::shared_ptr _rt_tex; + std::shared_ptr _rt2; + bool _rt2_updated; + std::shared_ptr _rt2_tex; + std::shared_ptr _fx; public: