2.0. Fixed rendering stalls caused by ogl frame allocation delays.

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

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index e659c618b1678a5888aac89054ac98cdc81e35db..1eeb50bd334ecb71c55460b96d4408a0e99a0485 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -65,6 +65,8 @@ struct image_kernel::implementation : boost::noncopyable
        {\r
                static const double epsilon = 0.001;\r
 \r
+               ogl.yield();\r
+\r
                CASPAR_ASSERT(params.pix_desc.planes.size() == params.textures.size());\r
 \r
                if(params.textures.empty() || !params.background)\r
@@ -120,10 +122,19 @@ 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
-                       ogl.blend_func_separate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);                        \r
+                       switch(params.keyer)\r
+                       {\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
                }\r
 \r
                // Setup image-adjustements\r
@@ -195,6 +206,7 @@ struct image_kernel::implementation : boost::noncopyable
                \r
                // Set render target\r
                \r
+               ogl.yield();\r
                ogl.attach(*params.background);\r
                \r
                // Draw\r