\r
active_buffer_ = draw_buffer;\r
\r
- GL(glFlush());\r
- \r
+ channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock.\r
+ \r
return host_buffer;\r
}\r
\r
if(layer.empty())\r
return;\r
\r
- std::shared_ptr<device_buffer> local_key_buffer;\r
+ std::pair<int, std::shared_ptr<device_buffer>> local_key_buffer;\r
\r
- if(has_overlapping_items(layer, layer.front().transform.get_blend_mode()))\r
- {\r
- auto local_draw_buffer = create_device_buffer(4); \r
- \r
- BOOST_FOREACH(auto& item, layer) \r
- {\r
- item.transform.set_blend_mode(image_transform::blend_mode::normal);\r
- draw_item(std::move(item), local_draw_buffer, local_key_buffer, layer_key_buffer); \r
- }\r
-\r
- kernel_.draw(channel_.ogl(), create_render_item(local_draw_buffer, layer.front().transform.get_blend_mode()), draw_buffer, nullptr, nullptr);\r
- }\r
- else // fast path\r
- {\r
+ //if(has_overlapping_items(layer, layer.front().transform.get_blend_mode()))\r
+ //{\r
+ // auto local_draw_buffer = create_device_buffer(4); \r
+\r
+ // auto local_blend_mode = layer.front().transform.get_blend_mode();\r
+\r
+ // int fields = 0;\r
+ // BOOST_FOREACH(auto& item, layer)\r
+ // {\r
+ // if(fields & item.mode)\r
+ // item.transform.set_blend_mode(image_transform::blend_mode::normal); // Disable blending, it will be used when merging back into render stack.\r
+ // else\r
+ // {\r
+ // item.transform.set_blend_mode(image_transform::blend_mode::replace); // Target field is empty, no blending, just copy\r
+ // fields |= item.mode;\r
+ // }\r
+\r
+ // draw_item(std::move(item), local_draw_buffer, local_key_buffer, layer_key_buffer); \r
+ // }\r
+\r
+ // kernel_.draw(channel_.ogl(), create_render_item(local_draw_buffer, local_blend_mode), draw_buffer, nullptr, nullptr);\r
+ //}\r
+ //else // fast path\r
+ //{\r
BOOST_FOREACH(auto& item, layer) \r
draw_item(std::move(item), draw_buffer, local_key_buffer, layer_key_buffer); \r
- } \r
+ //} \r
+\r
+ CASPAR_ASSERT(local_key_buffer.first == 0 || local_key_buffer.first == core::video_mode::progressive);\r
\r
- std::swap(local_key_buffer, layer_key_buffer);\r
+ std::swap(local_key_buffer.second, layer_key_buffer);\r
}\r
\r
- void draw_item(render_item&& item, const safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>& local_key_buffer, std::shared_ptr<device_buffer>& layer_key_buffer)\r
+ void draw_item(render_item&& item, \r
+ const safe_ptr<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
if(item.transform.get_is_key())\r
{\r
- if(!local_key_buffer)\r
- local_key_buffer = create_device_buffer(1);\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
+ // No transparency for key\r
item.transform.set_opacity(1.0);\r
item.transform.set_blend_mode(image_transform::blend_mode::normal);\r
- kernel_.draw(channel_.ogl(), std::move(item), make_safe(local_key_buffer), nullptr, nullptr);\r
+\r
+ local_key_buffer.first |= item.mode;\r
+ kernel_.draw(channel_.ogl(), std::move(item), make_safe(local_key_buffer.second), nullptr, nullptr);\r
}\r
else\r
{\r
- kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer, layer_key_buffer);\r
- local_key_buffer.reset();\r
- }\r
- }\r
-\r
- // TODO: Optimize\r
- bool has_overlapping_items(const layer& layer, image_transform::blend_mode::type blend_mode)\r
- {\r
- if(layer.empty())\r
- return false; \r
- \r
- implementation::layer fill;\r
-\r
- std::copy_if(layer.begin(), layer.end(), std::back_inserter(fill), [&](const render_item& item)\r
- {\r
- return !item.transform.get_is_key();\r
- });\r
+ kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer.second, layer_key_buffer);\r
+ local_key_buffer.first ^= item.mode;\r
\r
- if(blend_mode == image_transform::blend_mode::normal) // Only overlap if opacity\r
- {\r
- return std::any_of(fill.begin(), fill.end(), [&](const render_item& item)\r
+ if(local_key_buffer.first == 0)\r
{\r
- return item.transform.get_opacity() < 1.0 - 0.001;\r
- });\r
+ local_key_buffer.first = 0;\r
+ local_key_buffer.second.reset();\r
+ }\r
}\r
-\r
- // Simple solution, just check if we have differnt video streams / tags.\r
- return std::any_of(fill.begin(), fill.end(), [&](const render_item& item)\r
- {\r
- return item.tag != fill.front().tag;\r
- });\r
- } \r
- \r
- render_item create_render_item(const safe_ptr<device_buffer>& buffer, image_transform::blend_mode::type blend_mode)\r
- {\r
- CASPAR_ASSERT(buffer->stride() == 4 && "Only used for bgra textures");\r
-\r
- pixel_format_desc desc;\r
- desc.pix_fmt = pixel_format::bgra;\r
- desc.planes.push_back(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));\r
-\r
- std::vector<safe_ptr<device_buffer>> textures;\r
- textures.push_back(buffer);\r
- \r
- image_transform transform;\r
- transform.set_blend_mode(blend_mode);\r
-\r
- return render_item(desc, std::move(textures), transform, video_mode::progressive, nullptr); \r
}\r
\r
+ //// TODO: Optimize\r
+ //bool has_overlapping_items(const layer& layer, image_transform::blend_mode::type blend_mode)\r
+ //{\r
+ // if(layer.size() < 2)\r
+ // return false; \r
+ // \r
+ // implementation::layer fill;\r
+\r
+ // std::copy_if(layer.begin(), layer.end(), std::back_inserter(fill), [&](const render_item& item)\r
+ // {\r
+ // return !item.transform.get_is_key();\r
+ // });\r
+ // \r
+ // if(blend_mode == image_transform::blend_mode::normal) // Only overlap if opacity\r
+ // {\r
+ // return std::any_of(fill.begin(), fill.end(), [&](const render_item& item)\r
+ // {\r
+ // return item.transform.get_opacity() < 1.0 - 0.001;\r
+ // });\r
+ // }\r
+\r
+ // // Simple solution, just check if we have differnt video streams / tags.\r
+ // return std::any_of(fill.begin(), fill.end(), [&](const render_item& item)\r
+ // {\r
+ // return item.tag != fill.front().tag;\r
+ // });\r
+ //} \r
+ // \r
+ //render_item create_render_item(const safe_ptr<device_buffer>& buffer, image_transform::blend_mode::type blend_mode)\r
+ //{\r
+ // CASPAR_ASSERT(buffer->stride() == 4 && "Only used for bgra textures");\r
+\r
+ // pixel_format_desc desc;\r
+ // desc.pix_fmt = pixel_format::bgra;\r
+ // desc.planes.push_back(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));\r
+\r
+ // std::vector<safe_ptr<device_buffer>> textures;\r
+ // textures.push_back(buffer);\r
+ // \r
+ // image_transform transform;\r
+ // transform.set_blend_mode(blend_mode);\r
+\r
+ // return render_item(desc, std::move(textures), transform, video_mode::progressive, nullptr); \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
projects / casparcg / blobdiff