2.0. Fixed mix transition.

[casparcg] / core / mixer / image / image_shader.cpp

diff --git a/core/mixer/image/image_shader.cpp b/core/mixer/image/image_shader.cpp
index d9b83877f74da3c52da6e0e34b8d98fa86d42d2e..85ceb4cca1ccdd2e7bd1529a7155a6ea74f75dfe 100644 (file)
--- a/core/mixer/image/image_shader.cpp
+++ b/core/mixer/image/image_shader.cpp
@@ -69,7 +69,11 @@ std::string get_blend_color_func()
        "                                                                                                                                                                       \n"                                                                                                                                                       \r
        "vec4 blend(vec4 fore)                                                                                                                          \n"\r
        "{                                                                                                                                                                      \n"\r
-       "   vec4 back = texture2D(background, gl_TexCoord[1].st).bgra;                                          \n"\r
+       "   vec4 back = texture2D(background, gl_TexCoord[1].st).bgra;                                          \n"     \r
+       "                                                                                                                                                                       \n"             \r
+       "       if(blend_mode == 29) // mix                                                                                                             \n"\r
+       "               return fore + back;                                                                                                                     \n"\r
+       "                                                                                                                                                                       \n"             \r
        "       fore.rgb = get_blend_color(back.rgb, fore.rgb);                                                                 \n"\r
        "       return fore + (1.0-fore.a)*back;                                                                                                \n"\r
        "}                                                                                                                                                                      \n";                    \r
@@ -115,6 +119,7 @@ std::string get_fragment(bool blend_modes)
        "uniform bool           has_local_key;                                                                                                  \n"\r
        "uniform bool           has_layer_key;                                                                                                  \n"\r
        "uniform int            blend_mode;                                                                                                             \n"\r
+       "uniform int            alpha_mode;                                                                                                             \n"\r
        "uniform int            pixel_format;                                                                                                   \n"\r
        "                                                                                                                                                                       \n"\r
        "uniform float          opacity;                                                                                                                \n"\r