[vlc-commits] d3d_dynamic_shader: don't keep the source opacity in a variable
Steve Lhomme
git at videolan.org
Thu Feb 18 06:46:14 UTC 2021
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Feb 17 15:34:50 2021 +0100| [ab6a50c6a3e8510f17b17066cc4476e4e65815c1] | committer: Steve Lhomme
d3d_dynamic_shader: don't keep the source opacity in a variable
We still have the sampled value before we return.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ab6a50c6a3e8510f17b17066cc4476e4e65815c1
---
modules/video_output/win32/d3d_dynamic_shader.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/modules/video_output/win32/d3d_dynamic_shader.c b/modules/video_output/win32/d3d_dynamic_shader.c
index e41a818063..4bd71dbd1c 100644
--- a/modules/video_output/win32/d3d_dynamic_shader.c
+++ b/modules/video_output/win32/d3d_dynamic_shader.c
@@ -267,14 +267,12 @@ float4 main( PS_INPUT In ) : SV_TARGET\n\
else\n\
sample = sampleTexture( normalSampler, In.uv );\n\
float4 rgba = max(mul(sample, Colorspace),0);\n\
- float opacity = rgba.a * Opacity;\n\
- float4 rgb = rgba; rgb.a = 0;\n\
- rgb = sourceToLinear(rgb);\n\
- rgb = transformPrimaries(rgb);\n\
- rgb = toneMapping(rgb);\n\
- rgb = linearToDisplay(rgb);\n\
- rgb = adjustRange(rgb);\n\
- return float4(rgb.rgb, saturate(opacity));\n\
+ rgba = sourceToLinear(rgba);\n\
+ rgba = transformPrimaries(rgba);\n\
+ rgba = toneMapping(rgba);\n\
+ rgba = linearToDisplay(rgba);\n\
+ rgba = adjustRange(rgba);\n\
+ return float4(rgba.rgb, saturate(sample.a * Opacity));\n\
}\n\
";
More information about the vlc-commits
mailing list