瀏覽代碼

obs-transitions: Simplify fade shaders

jpark37 3 年之前
父節點
當前提交
2e6dcc7f17
共有 1 個文件被更改,包括 2 次插入10 次删除
  1. 2 10
      plugins/obs-transitions/data/fade_transition.effect

+ 2 - 10
plugins/obs-transitions/data/fade_transition.effect

@@ -41,27 +41,19 @@ float4 Fade(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);
-	rgba.rgb = srgb_nonlinear_to_linear(rgba.rgb);
 	return rgba;
 }
 
 float4 PSFade(FragData f_in) : TARGET
 {
 	float4 rgba = Fade(f_in);
-	return rgba;
-}
-
-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);
+	rgba.rgb = srgb_nonlinear_to_linear(rgba.rgb);
 	return rgba;
 }
 
 float4 PSFadeLinear(FragData f_in) : TARGET
 {
-	float4 rgba = FadeLinear(f_in);
+	float4 rgba = Fade(f_in);
 	return rgba;
 }