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

Merge pull request #673 from Xaymar/patch-1

Browse Source 
obs-transitions: Fix inefficient branching in slide_transition.effect
This commit is contained in:
Jim 2016-10-30 08:19:44 -07:00 committed by GitHub
commit 1728a5d1b7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/obs-transitions/data/slide_transition.effect
View File

@ -28,11 +28,12 @@ float4 PSSlide(VertData v_in) : TARGET
{
float2 tex_a_uv = v_in.uv + tex_a_dir;
float2 tex_b_uv = v_in.uv - tex_b_dir;
return (tex_a_uv.x - saturate(tex_a_uv.x) != 0.0) ||
(tex_a_uv.y - saturate(tex_a_uv.y) != 0.0)
? tex_b.Sample(textureSampler, tex_b_uv)
: tex_a.Sample(textureSampler, tex_a_uv);
float4 tex_a_sample = tex_a.Sample(textureSampler, tex_a_uv);
float4 tex_b_sample = tex_b.Sample(textureSampler, tex_b_uv);
float val = saturate(abs((tex_a_uv.x - saturate(tex_a_uv.x)) + (tex_a_uv.y - saturate(tex_a_uv.y))) * 65535);
return lerp(tex_a_sample, tex_b_sample, val);
}
technique Slide