Workbench: Fix depth of field background being glitchy

1 files changed, 13 insertions, 5 deletions

diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl
index bd16189db32..0efcfb35929 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl
@@ -251,7 +251,7 @@ void main()
   ivec2 texel = ivec2(uv * size);
 
   vec4 color = vec4(0.0);
-  float tot = 1e-4;
+  float tot = 0.0;
 
   float coc = decode_coc(texelFetch(inputCocTex, texel, 0).rg);
   float max_radius = coc;
@@ -272,7 +272,12 @@ void main()
     tot += weight;
   }
 
-  blurColor = color / tot;
+  if (tot > 0.0) {
+    blurColor = color / tot;
+  }
+  else {
+    blurColor = textureLod(halfResColorTex, uv, 0.0);
+  }
 }
 #endif
 
@@ -385,7 +390,9 @@ void main()
  * ----------------- STEP 4 ------------------
  */
 #ifdef RESOLVE
-out vec4 finalColor;
+
+layout(location = 0) out vec4 finalColorAdd;
+layout(location = 1) out vec4 finalColorMul;
 
 void main()
 {
@@ -398,7 +405,8 @@ void main()
   float zdepth = linear_depth(depth);
   float coc = calculate_coc(zdepth);
 
-  finalColor = texture(halfResColorTex, uv);
-  finalColor.a = smoothstep(1.0, 3.0, abs(coc));
+  float blend = smoothstep(1.0, 3.0, abs(coc));
+  finalColorAdd = texture(halfResColorTex, uv) * blend;
+  finalColorMul = vec4(1.0 - blend);
 }
 #endif