2.0. - blend_modes are re-enabled.

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

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 326128672bfa664cc876f580c6b4f5f001a48b45..f9676e068aeafd413f80362e35cc09655588d9fd 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -52,22 +52,22 @@ namespace caspar { namespace core {
                \r
 struct image_mixer::implementation : boost::noncopyable\r
 {              \r
-       typedef std::deque<render_item>                                 layer;\r
+       typedef std::deque<render_item>                 layer;\r
 \r
-       video_channel_context&                                                  channel_;\r
+       video_channel_context&                                  channel_;\r
 \r
-       std::vector<image_transform>                                    transform_stack_;\r
-       std::vector<video_mode::type>                                   mode_stack_;\r
+       std::vector<image_transform>                    transform_stack_;\r
+       std::vector<video_mode::type>                   mode_stack_;\r
 \r
-       std::deque<std::deque<render_item>>                             layers_; // layer/stream/items\r
+       std::deque<std::deque<render_item>>             layers_; // layer/stream/items\r
        \r
-       image_kernel                                                                    kernel_;\r
+       image_kernel                                                    kernel_;\r
                \r
-       std::array<std::shared_ptr<device_buffer>,2>    draw_buffer_;\r
-       std::shared_ptr<device_buffer>                                  write_buffer_;\r
+       std::shared_ptr<device_buffer>                  draw_buffer_;\r
+       std::shared_ptr<device_buffer>                  write_buffer_;\r
 \r
-       std::array<std::shared_ptr<device_buffer>,2>    local_key_buffer_;\r
-       std::shared_ptr<device_buffer>                                  layer_key_buffer_;\r
+       std::shared_ptr<device_buffer>                  local_key_buffer_;\r
+       std::shared_ptr<device_buffer>                  layer_key_buffer_;\r
        \r
 public:\r
        implementation(video_channel_context& video_channel) \r
@@ -87,10 +87,8 @@ public:
        {\r
                write_buffer_                   = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);\r
                layer_key_buffer_               = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
-               draw_buffer_[0]                 = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);\r
-               //draw_buffer_[1]                       = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);\r
-               local_key_buffer_[0]    = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
-               //local_key_buffer_[1]  = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
+               draw_buffer_                    = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);\r
+               local_key_buffer_               = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
                channel_.ogl().gc();\r
        }\r
 \r
@@ -143,21 +141,21 @@ public:
                if(channel_.get_format_desc().width != write_buffer_->width() || channel_.get_format_desc().height != write_buffer_->height())\r
                        initialize_buffers();\r
                \r
-               layer_key_buffer_->clear();\r
-               draw_buffer_[0]->clear();\r
-               //draw_buffer_[1]->clear();\r
-               local_key_buffer_[0]->clear();\r
-               //local_key_buffer_[1]->clear();\r
-\r
+               channel_.ogl().clear(*layer_key_buffer_);\r
+               channel_.ogl().clear(*local_key_buffer_);\r
+               channel_.ogl().clear(*draw_buffer_);\r
+               \r
                bool layer_key = false;\r
-\r
+               \r
                BOOST_FOREACH(auto& layer, layers)\r
                        draw(std::move(layer), layer_key);\r
 \r
-               std::swap(draw_buffer_[0], write_buffer_);\r
+               std::swap(draw_buffer_, write_buffer_);\r
                \r
                auto host_buffer = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);\r
-               host_buffer->begin_read(*write_buffer_);\r
+       \r
+               channel_.ogl().attach(*write_buffer_);\r
+               host_buffer->begin_read(write_buffer_->width(), write_buffer_->height(), format(write_buffer_->stride()));\r
                \r
                GL(glFlush());\r
 \r
@@ -167,15 +165,15 @@ public:
        void draw(layer&& layer, bool& layer_key)\r
        {                       \r
                bool local_key = false;\r
-\r
-               local_key_buffer_[0]->clear();\r
+               \r
+               channel_.ogl().clear(*local_key_buffer_);\r
 \r
                BOOST_FOREACH(auto& item, layer)\r
                        draw(std::move(item), local_key, layer_key);\r
                \r
                layer_key = local_key;\r
 \r
-               std::swap(local_key_buffer_[0], layer_key_buffer_);\r
+               std::swap(local_key_buffer_, layer_key_buffer_);\r
        }\r
 \r
        void draw(render_item&& item, bool& local_key, bool& layer_key)\r
@@ -187,14 +185,13 @@ public:
                }\r
                else\r
                {\r
-                       draw(draw_buffer_, std::move(item), local_key ? local_key_buffer_[0] : nullptr, layer_key ? layer_key_buffer_ : nullptr);       \r
-                       local_key_buffer_[0]->clear();\r
+                       draw(draw_buffer_, std::move(item), local_key ? local_key_buffer_ : nullptr, layer_key ? layer_key_buffer_ : nullptr);  \r
+                       channel_.ogl().clear(*local_key_buffer_);\r
                        local_key = false;\r
                }\r
-               channel_.ogl().yield(); // Return resources to pool as early as possible.\r
        }\r
        \r
-       void draw(std::array<std::shared_ptr<device_buffer>,2>& targets, render_item&& item, const std::shared_ptr<device_buffer>& local_key, const std::shared_ptr<device_buffer>& layer_key)\r
+       void draw(std::shared_ptr<device_buffer>& target, render_item&& item, const std::shared_ptr<device_buffer>& local_key, const std::shared_ptr<device_buffer>& layer_key)\r
        {\r
                if(!std::all_of(item.textures.begin(), item.textures.end(), std::mem_fn(&device_buffer::ready)))\r
                {\r
@@ -202,18 +199,8 @@ public:
                        channel_.ogl().yield(); // Try to give it some more time.\r
                }               \r
 \r
-               targets[0]->attach();\r
-               kernel_.draw(item, make_safe(targets[0]), local_key, layer_key);\r
-\r
-               //targets[1]->attach();\r
-                       \r
-               //kernel_.draw(item, make_safe(targets[0]), local_key, layer_key);\r
-               \r
-               //targets[0]->bind();\r
-\r
-               //glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, targets[0]->width(), targets[0]->height());\r
-               \r
-               //std::swap(targets[0], targets[1]);\r
+               channel_.ogl().attach(*target);\r
+               kernel_.draw(channel_.ogl(), std::move(item), make_safe(target), local_key, layer_key);\r
        }\r
                                \r
        safe_ptr<write_frame> create_frame(const void* tag, const core::pixel_format_desc& desc)\r