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

obs-transitions: Simplify fade shaders

Browse Source
This commit is contained in:
jpark37 2022-07-28 01:17:36 -07:00 committed by Jim
parent 5bdd4fe658
commit 2e6dcc7f17
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/obs-transitions/data/fade_transition.effect
View File

@ -41,27 +41,19 @@ float4 Fade(FragData f_in)
float4 a_val = tex_a.Sample(textureSampler, f_in.uv); float4 a_val = tex_a.Sample(textureSampler, f_in.uv);
float4 b_val = tex_b.Sample(textureSampler, f_in.uv); float4 b_val = tex_b.Sample(textureSampler, f_in.uv);
float4 rgba = lerp(a_val, b_val, fade_val); float4 rgba = lerp(a_val, b_val, fade_val);
rgba.rgb = srgb_nonlinear_to_linear(rgba.rgb);
return rgba; return rgba;
} }
float4 PSFade(FragData f_in) : TARGET float4 PSFade(FragData f_in) : TARGET
{ {
float4 rgba = Fade(f_in); float4 rgba = Fade(f_in);
return rgba; rgba.rgb = srgb_nonlinear_to_linear(rgba.rgb);
}
float4 FadeLinear(FragData f_in)
{
float4 a_val = tex_a.Sample(textureSampler, f_in.uv);
float4 b_val = tex_b.Sample(textureSampler, f_in.uv);
float4 rgba = lerp(a_val, b_val, fade_val);
return rgba; return rgba;
} }
float4 PSFadeLinear(FragData f_in) : TARGET float4 PSFadeLinear(FragData f_in) : TARGET
{ {
float4 rgba = FadeLinear(f_in); float4 rgba = Fade(f_in);
return rgba; return rgba;
} }