2.0. image_mixer: Refactored blend-modes.

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

diff --git a/core/mixer/image/image_kernel.h b/core/mixer/image/image_kernel.h
index 07078e870b9c90ea4cb1340590b3a1e7243e98c0..9debd7fd36551ca304b718d44c99018ee009caf4 100644 (file)
--- a/core/mixer/image/image_kernel.h
+++ b/core/mixer/image/image_kernel.h
@@ -19,6 +19,8 @@
 */\r
 #pragma once\r
 \r
+#include "blend_modes.h"\r
+\r
 #include <common/memory/safe_ptr.h>\r
 \r
 #include <core/producer/frame/pixel_format.h>\r
@@ -38,19 +40,22 @@ struct render_item
        image_transform                                                 transform;\r
        video_mode::type                                                mode;\r
        const void*                                                             tag;\r
+       blend_mode::type                                                blend_mode;\r
        \r
-       render_item(const pixel_format_desc& pix_desc, const std::vector<safe_ptr<device_buffer>>& textures, const image_transform& transform, video_mode::type mode, const void* tag)\r
+       render_item(const pixel_format_desc& pix_desc, const std::vector<safe_ptr<device_buffer>>& textures, const image_transform& transform, video_mode::type mode, const void* tag, blend_mode::type blend_mode)\r
                : pix_desc(pix_desc)\r
                , textures(textures)\r
                , transform(transform)\r
                , mode(mode)\r
-               , tag(tag){}\r
+               , tag(tag)\r
+               , blend_mode(blend_mode){}\r
        render_item(render_item&& other)\r
                : pix_desc(other.pix_desc)\r
                , textures(std::move(other.textures))\r
                , transform(other.transform)\r
                , mode(other.mode)\r
-               , tag(other.tag){}\r
+               , tag(other.tag)\r
+               , blend_mode(blend_mode){}\r
 };\r
 \r
 bool operator==(const render_item& lhs, const render_item& rhs);\r
@@ -59,7 +64,11 @@ class image_kernel : boost::noncopyable
 {\r
 public:\r
        image_kernel();\r
-       void draw(ogl_device& ogl, render_item&& item, const safe_ptr<device_buffer>& background, const std::shared_ptr<device_buffer>& local_key = nullptr, const std::shared_ptr<device_buffer>& layer_key = nullptr);\r
+       void draw(ogl_device& ogl, \r
+                         render_item&& item, \r
+                         const safe_ptr<device_buffer>& background, \r
+                         const std::shared_ptr<device_buffer>& local_key = nullptr, \r
+                         const std::shared_ptr<device_buffer>& layer_key = nullptr);\r
 private:\r
        struct implementation;\r
        safe_ptr<implementation> impl_;\r