diff --git a/libobs/obs-source.c b/libobs/obs-source.c index 9b51d65df..a32a50465 100644 --- a/libobs/obs-source.c +++ b/libobs/obs-source.c @@ -1685,7 +1685,7 @@ static inline void render_filter_tex(texture_t tex, effect_t effect, void obs_source_process_filter(obs_source_t filter, effect_t effect, uint32_t width, uint32_t height, enum gs_color_format format, - enum allow_direct_render allow_direct) + enum obs_allow_direct_render allow_direct) { obs_source_t target, parent; uint32_t target_flags, parent_flags; @@ -1702,7 +1702,7 @@ void obs_source_process_filter(obs_source_t filter, effect_t effect, cy = obs_source_getheight(target); use_matrix = !!(target_flags & OBS_SOURCE_COLOR_MATRIX); expects_def = !(parent_flags & OBS_SOURCE_CUSTOM_DRAW); - can_directly = allow_direct == ALLOW_DIRECT_RENDERING; + can_directly = allow_direct == OBS_ALLOW_DIRECT_RENDERING; /* if the parent does not use any custom effects, and this is the last * filter in the chain for the parent, then render the parent directly diff --git a/libobs/obs.h b/libobs/obs.h index 86f4a6c2d..98ceda6a8 100644 --- a/libobs/obs.h +++ b/libobs/obs.h @@ -86,9 +86,9 @@ enum obs_order_movement { * render the source directly with the specified effect, or whether it should * render it to a texture */ -enum allow_direct_render { - NO_DIRECT_RENDERING, - ALLOW_DIRECT_RENDERING, +enum obs_allow_direct_render { + OBS_NO_DIRECT_RENDERING, + OBS_ALLOW_DIRECT_RENDERING, }; /** @@ -724,7 +724,7 @@ EXPORT void obs_source_release_frame(obs_source_t source, /** Default RGB filter handler for generic effect filters */ EXPORT void obs_source_process_filter(obs_source_t filter, effect_t effect, uint32_t width, uint32_t height, enum gs_color_format format, - enum allow_direct_render allow_direct); + enum obs_allow_direct_render allow_direct); /** * Adds a child source. Must be called by parent sources on child sources diff --git a/test/test-input/test-filter.c b/test/test-input/test-filter.c index e232b256a..1c4d170d3 100644 --- a/test/test-input/test-filter.c +++ b/test/test-input/test-filter.c @@ -51,7 +51,7 @@ static void filter_render(void *data, effect_t effect) { struct test_filter *tf = data; obs_source_process_filter(tf->source, tf->whatever, 0, 0, GS_RGBA, - ALLOW_DIRECT_RENDERING); + OBS_ALLOW_DIRECT_RENDERING); UNUSED_PARAMETER(effect); }