[mixer] Merged fixed from 2.0 where contrast adjustment incorrectly worked on premult...

[casparcg] / accelerator / ogl / image / image_shader.cpp

diff --git a/accelerator/ogl/image/image_shader.cpp b/accelerator/ogl/image/image_shader.cpp
index c4a5ecdc3519fe3d76fb22b699c2faf761ca9b60..96753a5a4497ab7ccb6f70f46247fe823bd9a93f 100644 (file)
--- a/accelerator/ogl/image/image_shader.cpp
+++ b/accelerator/ogl/image/image_shader.cpp
@@ -210,8 +210,8 @@ std::string get_fragment(bool blend_modes, bool post_processing)
                        uniform float           chroma_min_saturation;
                        uniform float           chroma_min_brightness;
                        uniform float           chroma_softness;
-                       uniform float           chroma_spill;
-                       uniform float           chroma_spill_darken;
+                       uniform float           chroma_spill_suppress;
+                       uniform float           chroma_spill_suppress_saturation;
        )shader"
 
        +
@@ -337,7 +337,7 @@ std::string get_fragment(bool blend_modes, bool post_processing)
                                        if(levels)
                                                color.rgb = LevelsControl(color.rgb, min_input, gamma, max_input, min_output, max_output);
                                        if(csb)
-                                               color.rgb = ContrastSaturationBrightness(color.rgb, brt, sat, con);
+                                               color.rgb = ContrastSaturationBrightness(color, brt, sat, con);
                                        if(has_local_key)
                                                color *= texture2D(local_key, gl_TexCoord[1].st).r;
                                        if(has_layer_key)