2.0. - blend_modes are re-enabled.

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

diff --git a/core/mixer/image/image_kernel.h b/core/mixer/image/image_kernel.h
index 11512c524f465b13f50f84b2c2b3a1304f6e4094..07078e870b9c90ea4cb1340590b3a1e7243e98c0 100644 (file)
--- a/core/mixer/image/image_kernel.h
+++ b/core/mixer/image/image_kernel.h
@@ -24,16 +24,42 @@
 #include <core/producer/frame/pixel_format.h>\r
 #include <core/producer/frame/image_transform.h>\r
 \r
+#include <boost/noncopyable.hpp>\r
+\r
 namespace caspar { namespace core {\r
        \r
 class device_buffer;\r
+class ogl_device;\r
+\r
+struct render_item\r
+{\r
+       pixel_format_desc                                               pix_desc;\r
+       std::vector<safe_ptr<device_buffer>>    textures;\r
+       image_transform                                                 transform;\r
+       video_mode::type                                                mode;\r
+       const void*                                                             tag;\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
+               : pix_desc(pix_desc)\r
+               , textures(textures)\r
+               , transform(transform)\r
+               , mode(mode)\r
+               , tag(tag){}\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
+};\r
+\r
+bool operator==(const render_item& lhs, const render_item& rhs);\r
 \r
-class image_kernel\r
+class image_kernel : boost::noncopyable\r
 {\r
 public:\r
        image_kernel();\r
-       void draw(size_t width,  size_t height, const core::pixel_format_desc& pix_desc,  const core::image_transform& transform, const std::vector<safe_ptr<device_buffer>>& planes, \r
-                         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, 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
 private:\r
        struct implementation;\r
        safe_ptr<implementation> impl_;\r