git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

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

diff --git a/core/mixer/image/image_shader.cpp b/core/mixer/image/image_shader.cpp
index 6d89630c2c2da0a54a550ac7b2537109d1c1d3ca..e8662def2ffec79973b1fc740492ed98acfa5066 100644 (file)
--- a/core/mixer/image/image_shader.cpp
+++ b/core/mixer/image/image_shader.cpp
@@ -69,16 +69,14 @@ 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
-       "       fore.rgb = get_blend_color(back.rgb, fore.rgb);                                                                 \n"\r
-       "                                                                                                                                                                       \n"             \r
-       "       switch(keyer)                                                                                                                                   \n"\r
-       "       {                                                                                                                                                               \n"\r
-       "               case 0: return fore + (1.0-fore.a)*back; // linear                                                      \n"\r
-       "               case 1: return fore + back; // additive                                                                         \n"\r
+       "   vec4 back = texture2D(background, gl_TexCoord[1].st).bgra;                                          \n"\r
+       "   if(blend_mode != 0)                                                                                                                         \n"\r
+       "               fore.rgb = get_blend_color(back.rgb/(back.a+0.0000001), fore.rgb/(fore.a+0.0000001))*fore.a;\n"\r
+       "       switch(keyer)                                                                                                                                   \n"     \r
+       "       {                                                                                                                                                               \n"     \r
+       "               case 1:  return fore + back; // additive                                                                        \n"\r
+       "               default: return fore + (1.0-fore.a)*back; // linear                                                     \n"\r
        "       }                                                                                                                                                               \n"\r
-       "                                                                                                                                                                       \n"                                     \r
-       "       return fore + (1.0-fore.a)*back;                                                                                                \n"\r
        "}                                                                                                                                                                      \n";                    \r
 }\r
                \r
@@ -261,7 +259,7 @@ safe_ptr<shader> get_image_shader(ogl_device& ogl, bool& blend_modes)
        if(g_shader)\r
        {\r
                blend_modes = g_blend_modes;\r
-               return make_safe(g_shader);\r
+               return make_safe_ptr(g_shader);\r
        }\r
                \r
        try\r
@@ -288,7 +286,7 @@ safe_ptr<shader> get_image_shader(ogl_device& ogl, bool& blend_modes)
        }\r
 \r
        blend_modes = g_blend_modes;\r
-       return make_safe(g_shader);\r
+       return make_safe_ptr(g_shader);\r
 }\r
 \r
-}}
\ No newline at end of file
+}}\r