[Bf-blender-cvs] [d4420d7070b] tmp-overlay-engine: Fix FXAA alpha issue.

[Clément Foucault]

Commit: d4420d7070b2172ffd9a710fd25550e4bd03d8a5
Author: Clément Foucault
Date:   Tue Nov 26 13:37:12 2019 +0100
Branches: tmp-overlay-engine
https://developer.blender.org/rBd4420d7070b2172ffd9a710fd25550e4bd03d8a5

Fix FXAA alpha issue.

We just take the full RGBA color instead of packing the luma in alpha.

===================================================================

M	source/blender/draw/engines/workbench/shaders/workbench_effect_fxaa_frag.glsl
M	source/blender/draw/intern/shaders/common_fxaa_lib.glsl

===================================================================

diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_fxaa_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_fxaa_frag.glsl
index 092878e43aa..95ca2c0c297 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_fxaa_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_fxaa_frag.glsl
@@ -9,8 +9,6 @@ uniform vec2 invertedViewportSize;
 void main()
 {
   ivec2 texel = ivec2(gl_FragCoord.xy);
-  float alpha = texelFetch(colorBuffer, texel, 0).a;
   FragColor = FxaaPixelShader(
       uvcoordsvar.st, colorBuffer, invertedViewportSize, 1.0, 0.166, 0.0833);
-  FragColor.a = alpha;
 }
diff --git a/source/blender/draw/intern/shaders/common_fxaa_lib.glsl b/source/blender/draw/intern/shaders/common_fxaa_lib.glsl
index 9928f350fd0..9eaba00988d 100644
--- a/source/blender/draw/intern/shaders/common_fxaa_lib.glsl
+++ b/source/blender/draw/intern/shaders/common_fxaa_lib.glsl
@@ -879,6 +879,6 @@ vec4 FxaaPixelShader(
   if (horzSpan) {
     posM.y += pixelOffsetSubpix * lengthSign;
   }
-  return vec4(FxaaTexTop(tex, posM).xyz, lumaM);
+  return FxaaTexTop(tex, posM);
 }
 /*==========================================================================*/