jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Merge obs_source_process_filter_(tech_)?end functions

Browse Source
This commit is contained in:
SoraYuki 2019-07-23 11:50:10 +08:00
parent ae83c857d7
commit 21135f1483
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libobs/obs-source.c
View File

@ -3383,32 +3383,20 @@ void obs_source_process_filter_tech_end(obs_source_t *filter,
render_filter_bypass(target, effect, tech); render_filter_bypass(target, effect, tech);
} else { } else {
texture = gs_texrender_get_texture(filter->filter_texrender); texture = gs_texrender_get_texture(filter->filter_texrender);
render_filter_tex(texture, effect, width, height, tech); if (texture) {
render_filter_tex(texture, effect, width, height, tech);
}
} }
} }
void obs_source_process_filter_end(obs_source_t *filter, gs_effect_t *effect, void obs_source_process_filter_end(obs_source_t *filter, gs_effect_t *effect,
uint32_t width, uint32_t height) uint32_t width, uint32_t height)
{ {
obs_source_t *target, *parent;
gs_texture_t *texture;
uint32_t parent_flags;
if (!obs_ptr_valid(filter, "obs_source_process_filter_end")) if (!obs_ptr_valid(filter, "obs_source_process_filter_end"))
return; return;
target = obs_filter_get_target(filter); obs_source_process_filter_tech_end(filter, effect, width, height,
parent = obs_filter_get_parent(filter); "Draw");
parent_flags = parent->info.output_flags;
if (can_bypass(target, parent, parent_flags, filter->allow_direct)) {
render_filter_bypass(target, effect, "Draw");
} else {
texture = gs_texrender_get_texture(filter->filter_texrender);
if (texture)
render_filter_tex(texture, effect, width, height,
"Draw");
}
} }
void obs_source_skip_video_filter(obs_source_t *filter) void obs_source_skip_video_filter(obs_source_t *filter)