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

Remove 'effect' param from effect param funcs

Browse Source 
Similar to the shader functions, the effect parameter functions take
the effect as a parameter.  However, the effect parameter is pretty
pointless, because the effect parameter.. parameter stores the effect
pointer interally.
This commit is contained in:
jp9000
2014-06-25 20:29:46 -07:00
parent f025cd6f87
commit dbb9124bf6
11 changed files with 59 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libobs/obs-video.c
View File

@@ -138,8 +138,8 @@ static inline void render_output_texture(struct obs_core_video *video,
0.000000f, 0.000000f, 0.000000f, 1.000000f
};
effect_setval(effect, matrix, mat_val, sizeof(mat_val));
effect_settexture(effect, image, texture);
effect_setval(matrix, mat_val, sizeof(mat_val));
effect_settexture(image, texture);
passes = technique_begin(tech);
for (i = 0; i < passes; i++) {
@@ -155,7 +155,7 @@ static inline void render_output_texture(struct obs_core_video *video,
static inline void set_eparam(effect_t effect, const char *name, float val)
{
eparam_t param = effect_getparambyname(effect, name);
effect_setfloat(effect, param, val);
effect_setfloat(param, val);
}
static void render_convert_texture(struct obs_core_video *video,
@@ -187,7 +187,7 @@ static void render_convert_texture(struct obs_core_video *video,
set_eparam(effect, "height_d2_i", 1.0f / (fheight * 0.5f));
set_eparam(effect, "input_height", (float)video->conversion_height);
effect_settexture(effect, image, texture);
effect_settexture(image, texture);
gs_setrendertarget(target, NULL);
set_render_size(video->output_width, video->conversion_height);