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

(API Change) Rename allow_direct_render enum 

For the sake of consistency, changed allow_direct_render to
obs_allow_direct_render
master
jp9000 2014-08-02 08:21:00 -07:00
parent d2b4f82637
commit 4d1272e6e2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libobs/obs-source.c
View File

@ -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

8
libobs/obs.h
View File

@ -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

2
test/test-input/test-filter.c
View File

@ -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);
}