#include <gl/glew.h>\r
\r
#include <boost/foreach.hpp>\r
+#include <boost/range/algorithm_ext/erase.hpp>\r
\r
#include <algorithm>\r
#include <deque>\r
private:\r
safe_ptr<host_buffer> do_render(std::vector<layer>&& layers)\r
{\r
- std::shared_ptr<device_buffer> layer_key_buffer;\r
-\r
auto draw_buffer = create_device_buffer(4);\r
- \r
- BOOST_FOREACH(auto& layer, layers)\r
- draw_layer(std::move(layer), draw_buffer, layer_key_buffer);\r
- \r
+\r
+ if(channel_.get_format_desc().field_mode != field_mode::progressive)\r
+ {\r
+ auto upper = layers;\r
+ auto lower = std::move(layers);\r
+\r
+ BOOST_FOREACH(auto& layer, upper)\r
+ {\r
+ boost::remove_erase_if(layer.items, [](const render_item& item){return !(item.transform.field_mode & field_mode::upper);});\r
+ BOOST_FOREACH(auto& item, layer.items)\r
+ item.transform.field_mode = field_mode::upper;\r
+ }\r
+\r
+ BOOST_FOREACH(auto& layer, lower)\r
+ {\r
+ boost::remove_erase_if(layer.items, [](const render_item& item){return !(item.transform.field_mode & field_mode::lower);});\r
+ BOOST_FOREACH(auto& item, layer.items)\r
+ item.transform.field_mode = field_mode::lower;\r
+ }\r
+\r
+ draw(std::move(upper), *draw_buffer);\r
+ draw(std::move(lower), *draw_buffer);\r
+ }\r
+ else\r
+ {\r
+ draw(std::move(layers), *draw_buffer);\r
+ }\r
+\r
auto host_buffer = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);\r
channel_.ogl().attach(*draw_buffer);\r
host_buffer->begin_read(draw_buffer->width(), draw_buffer->height(), format(draw_buffer->stride()));\r
return host_buffer;\r
}\r
\r
- void draw_layer(layer&& layer, const safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>& layer_key_buffer)\r
+ void draw(std::vector<layer>&& layers, \r
+ device_buffer& draw_buffer)\r
+ {\r
+ std::shared_ptr<device_buffer> layer_key_buffer;\r
+\r
+ BOOST_FOREACH(auto& layer, layers)\r
+ draw_layer(std::move(layer), draw_buffer, layer_key_buffer);\r
+ }\r
+\r
+ void draw_layer(layer&& layer, \r
+ device_buffer& draw_buffer,\r
+ std::shared_ptr<device_buffer>& layer_key_buffer)\r
{ \r
if(layer.items.empty())\r
return;\r
\r
- std::pair<int, std::shared_ptr<device_buffer>> local_key_buffer = std::make_pair(0, nullptr); // int is fields flag\r
+ std::shared_ptr<device_buffer> local_key_buffer;\r
\r
- if(layer.blend_mode != blend_mode::normal && has_overlapping_items(layer))\r
+ if(layer.blend_mode != blend_mode::normal && layer.items.size() > 1)\r
{\r
- auto layer_draw_buffer = create_device_buffer(4); // int is fields flag\r
+ auto layer_draw_buffer = create_device_buffer(4);\r
\r
BOOST_FOREACH(auto& item, layer.items)\r
draw_item(std::move(item), *layer_draw_buffer, local_key_buffer, layer_key_buffer); \r
item.transform = frame_transform();\r
item.blend_mode = layer.blend_mode;\r
\r
- kernel_.draw(channel_.ogl(), std::move(item), *draw_buffer, nullptr, nullptr);\r
+ kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, nullptr, nullptr);\r
}\r
else // fast path\r
{\r
BOOST_FOREACH(auto& item, layer.items) \r
- draw_item(std::move(item), *draw_buffer, local_key_buffer, layer_key_buffer); \r
+ draw_item(std::move(item), draw_buffer, local_key_buffer, layer_key_buffer); \r
} \r
-\r
- CASPAR_ASSERT(local_key_buffer.first == 0 || local_key_buffer.first == core::field_mode::progressive);\r
-\r
- std::swap(local_key_buffer.second, layer_key_buffer);\r
+ \r
+ std::swap(local_key_buffer, layer_key_buffer);\r
}\r
\r
- void draw_item(render_item&& item, \r
- device_buffer& draw_buffer, \r
- std::pair<int, std::shared_ptr<device_buffer>>& local_key_buffer, \r
- std::shared_ptr<device_buffer>& layer_key_buffer)\r
- { \r
+ void draw_item(render_item&& item, \r
+ device_buffer& draw_buffer, \r
+ std::shared_ptr<device_buffer>& local_key_buffer, \r
+ std::shared_ptr<device_buffer>& layer_key_buffer)\r
+ { \r
if(item.transform.is_key)\r
{\r
- if(!local_key_buffer.second)\r
- {\r
- local_key_buffer.first = 0;\r
- local_key_buffer.second = create_device_buffer(1);\r
- }\r
- \r
- local_key_buffer.first |= item.transform.field_mode; // Add field to flag.\r
- kernel_.draw(channel_.ogl(), std::move(item), *local_key_buffer.second, nullptr, nullptr);\r
+ local_key_buffer = local_key_buffer ? local_key_buffer : create_device_buffer(1);\r
+ kernel_.draw(channel_.ogl(), std::move(item), *local_key_buffer, nullptr, nullptr);\r
}\r
else\r
{\r
- kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer.second, layer_key_buffer);\r
- local_key_buffer.first ^= item.transform.field_mode; // Remove field from flag.\r
- \r
- if(local_key_buffer.first == 0) // If all fields from key has been used, reset it\r
- {\r
- local_key_buffer.first = 0;\r
- local_key_buffer.second.reset();\r
- }\r
- }\r
+ kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer, layer_key_buffer);\r
+ local_key_buffer = nullptr;\r
+ } \r
}\r
-\r
- bool has_overlapping_items(const layer& layer)\r
- { \r
- auto upper_count = boost::range::count_if(layer.items, [&](const render_item& item)\r
- {\r
- return !item.transform.is_key && (item.transform.field_mode & field_mode::upper);\r
- });\r
-\r
- auto lower_count = boost::range::count_if(layer.items, [&](const render_item& item)\r
- {\r
- return !item.transform.is_key && (item.transform.field_mode & field_mode::lower);\r
- });\r
-\r
- return upper_count > 1 || lower_count > 1;\r
- } \r
- \r
+ \r
safe_ptr<device_buffer> create_device_buffer(size_t stride)\r
{\r
auto buffer = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, stride);\r
return buffer;\r
}\r
};\r
-\r
\r
struct image_mixer::implementation : boost::noncopyable\r
{ \r
}\r
\r
void visit(core::write_frame& frame)\r
- { \r
- if(transform_stack_.back().field_mode == field_mode::empty)\r
+ { \r
+ if(frame.get_frame_transform().field_mode == field_mode::empty)\r
return;\r
- \r
+\r
core::render_item item;\r
item.pix_desc = frame.get_pixel_format_desc();\r
item.textures = frame.get_textures();\r
projects / casparcg / blobdiff