2.0. image_mixer: Added "keyer" concept.

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

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index 1fd83d91d5d8b0b0efd6a32cd21f8c4adaa70c80..9e5e4de0cb56cc6faf00240f6c680ba145f7bb65 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -120,14 +120,16 @@ struct image_kernel::implementation : boost::noncopyable
 \r
                        shader_->set("background",      texture_id::background);\r
                        shader_->set("blend_mode",      params.blend_mode);\r
+                       shader_->set("keyer",           params.keyer);\r
                }\r
                else\r
                {\r
-                       switch(params.blend_mode)\r
+                       switch(params.keyer)\r
                        {\r
-                       case blend_mode::mix:\r
+                       case keyer::additive:\r
                                ogl.blend_func(GL_ONE, GL_ONE); \r
                                break;\r
+                       case keyer::linear:\r
                        default:                                \r
                                ogl.blend_func(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); \r
                        }               \r