From 36201d9b6779ad472daf52a288685f44411a5bca Mon Sep 17 00:00:00 2001 From: James Park Date: Mon, 25 Mar 2019 08:38:45 -0700 Subject: [PATCH] libobs: Remove dead code in sharpness effect Not sure why, but there's a dead uniform and interpolant in the sharpness effect. This change removes them. --- plugins/obs-filters/data/sharpness.effect | 25 ++++++++++------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/plugins/obs-filters/data/sharpness.effect b/plugins/obs-filters/data/sharpness.effect index 54a023ef9..ea88e1744 100644 --- a/plugins/obs-filters/data/sharpness.effect +++ b/plugins/obs-filters/data/sharpness.effect @@ -5,7 +5,6 @@ uniform float4x4 ViewProj; uniform texture2d image; uniform texture2d target; -uniform float4 color = {1.0, 1.0, 1.0, 1.0}; uniform float sharpness; uniform float texture_width; @@ -24,7 +23,6 @@ struct VertInOut { struct VertOut { float4 pos : POSITION; - float4 col : COLOR; float2 uv : TEXCOORD0; float4 t1 : TEXCOORD1; float4 t2 : TEXCOORD2; @@ -36,7 +34,6 @@ VertOut VSDefault(VertInOut vert_in) VertOut vert_out; vert_out.pos = mul(float4(vert_in.pos.xyz, 1.0), ViewProj); vert_out.uv = vert_in.uv; - vert_out.col = color; float2 ps = float2(1.0/texture_width, 1.0/texture_height); float dx = ps.x; @@ -52,23 +49,23 @@ float4 PSDrawBare(VertOut vert_in) : TARGET { float4 E = image.Sample(def_sampler, vert_in.uv); - float4 colorx = 8*E; + float4 color = 8*E; float4 B = image.Sample(def_sampler, vert_in.t1.yw); float4 D = image.Sample(def_sampler, vert_in.t2.xw); float4 F = image.Sample(def_sampler, vert_in.t2.zw); float4 H = image.Sample(def_sampler, vert_in.t3.yw); - colorx -= image.Sample(def_sampler, vert_in.t1.xw); - colorx -= B; - colorx -= image.Sample(def_sampler, vert_in.t1.zw); - colorx -= D; - colorx -= F; - colorx -= image.Sample(def_sampler, vert_in.t3.xw); - colorx -= H; - colorx -= image.Sample(def_sampler, vert_in.t3.zw); + color -= image.Sample(def_sampler, vert_in.t1.xw); + color -= B; + color -= image.Sample(def_sampler, vert_in.t1.zw); + color -= D; + color -= F; + color -= image.Sample(def_sampler, vert_in.t3.xw); + color -= H; + color -= image.Sample(def_sampler, vert_in.t3.zw); - colorx = ((E!=F && E!=D) || (E!=B && E!=H)) ? saturate(E + colorx*sharpness) : E; + color = ((E!=F && E!=D) || (E!=B && E!=H)) ? saturate(E + color*sharpness) : E; - return colorx; + return color; } technique Draw