(API Change) libobs: Use single func for base effects

API removed:
--------------------
gs_effect_t *obs_get_default_effect(void);
gs_effect_t *obs_get_default_rect_effect(void);
gs_effect_t *obs_get_opaque_effect(void);
gs_effect_t *obs_get_solid_effect(void);
gs_effect_t *obs_get_bicubic_effect(void);
gs_effect_t *obs_get_lanczos_effect(void);
gs_effect_t *obs_get_bilinear_lowres_effect(void);

API added:
--------------------
gs_effect_t *obs_get_base_effect(enum obs_base_effect effect);

Summary:
--------------------
Combines multiple near-identical functions into a single function with
an enum parameter.
This commit is contained in:
jp9000
2015-10-19 00:52:45 -07:00
parent f7e4a79517
commit 6ad8df8adb
15 changed files with 46 additions and 108 deletions
+2 -2
View File
@@ -517,7 +517,7 @@ void XCompcapMain::tick(float seconds)
void XCompcapMain::render(gs_effect_t *effect)
{
PLock lock(&p->lock, true);
effect = obs_get_opaque_effect();
effect = obs_get_base_effect(OBS_EFFECT_OPAQUE);
if (!lock.isLocked() || !p->tex)
return;
@@ -530,7 +530,7 @@ void XCompcapMain::render(gs_effect_t *effect)
}
if (p->cursor && p->gltex && p->show_cursor && !p->cursor_outside) {
effect = obs_get_default_effect();
effect = obs_get_base_effect(OBS_EFFECT_DEFAULT);
while (gs_effect_loop(effect, "Draw")) {
xcursor_render(p->cursor);
+2 -2
View File
@@ -432,7 +432,7 @@ static void xshm_video_render(void *vptr, gs_effect_t *effect)
{
XSHM_DATA(vptr);
effect = obs_get_opaque_effect();
effect = obs_get_base_effect(OBS_EFFECT_OPAQUE);
if (!data->texture)
return;
@@ -445,7 +445,7 @@ static void xshm_video_render(void *vptr, gs_effect_t *effect)
}
if (data->show_cursor) {
effect = obs_get_default_effect();
effect = obs_get_base_effect(OBS_EFFECT_DEFAULT);
while (gs_effect_loop(effect, "Draw")) {
xcb_xcursor_render(data->cursor);