return host_buffer;\r
}\r
\r
+ // TODO: We might have more overlaps for opacity transitions\r
+ // TODO: What about blending modes, are they ok? Maybe only overlap detection is required for opacity?\r
void draw(layer&& layer, std::shared_ptr<device_buffer>& layer_key_buffer)\r
- { \r
- std::shared_ptr<device_buffer> local_key_buffer;\r
- \r
- std::shared_ptr<device_buffer> atomic_draw_buffer; \r
- std::shared_ptr<device_buffer> atomic_local_key_buffer;\r
+ { \r
+ if(layer.empty())\r
+ return;\r
\r
- BOOST_FOREACH(auto& item, layer)\r
+ std::shared_ptr<device_buffer> local_key_buffer;\r
+ \r
+ if(has_overlapping_items(layer, layer.front().transform.get_blend_mode()))\r
{\r
- //if(item.transform.get_is_atomic()) // layers need to be atomic in-order to support blend-modes properly\r
- //{\r
- // if(!atomic_draw_buffer)\r
- // {\r
- // atomic_draw_buffer = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4); \r
- // channel_.ogl().clear(*atomic_draw_buffer);\r
- // }\r
-\r
- // draw(std::move(item), atomic_draw_buffer, atomic_local_key_buffer, nullptr);\r
- //}\r
- //else\r
- //{\r
- // if(atomic_draw_buffer)\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(make_safe(atomic_draw_buffer));\r
- // \r
- // atomic_draw_buffer.reset();\r
- // atomic_local_key_buffer.reset();\r
- // \r
- // render_item atomic_item(desc, std::move(textures), image_transform(), video_mode::progressive, nullptr);\r
- // draw(std::move(atomic_item), draw_buffer_, local_key_buffer, layer_key_buffer);\r
- // }\r
-\r
- // draw(std::move(item), draw_buffer_, local_key_buffer, layer_key_buffer);\r
- //}\r
-\r
- draw(std::move(item), local_key_buffer, layer_key_buffer);\r
+ auto local_draw_buffer = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4); \r
+ channel_.ogl().clear(*local_draw_buffer);\r
+\r
+ BOOST_FOREACH(auto& item, layer) \r
+ draw_item(std::move(item), local_draw_buffer, local_key_buffer, layer_key_buffer); \r
+ \r
+ kernel_.draw(channel_.ogl(), create_render_item(local_draw_buffer, layer.front().transform.get_blend_mode()), make_safe(draw_buffer_), nullptr, nullptr);\r
}\r
- \r
+ else // fast path\r
+ {\r
+ BOOST_FOREACH(auto& item, layer) \r
+ draw_item(std::move(item), make_safe(draw_buffer_), local_key_buffer, layer_key_buffer); \r
+ } \r
+\r
std::swap(local_key_buffer, layer_key_buffer);\r
}\r
\r
- void draw(render_item&& item, std::shared_ptr<device_buffer>& local_key_buffer, std::shared_ptr<device_buffer>& layer_key_buffer)\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
{ \r
if(item.transform.get_is_key())\r
{\r
channel_.ogl().clear(*local_key_buffer);\r
}\r
\r
- draw(std::move(item), local_key_buffer, nullptr, nullptr);\r
+ kernel_.draw(channel_.ogl(), std::move(item), make_safe(local_key_buffer), nullptr, nullptr);\r
}\r
else\r
{\r
- draw(std::move(item), draw_buffer_, local_key_buffer, layer_key_buffer); \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
- void draw(render_item&& item, std::shared_ptr<device_buffer>& draw_buffer, const std::shared_ptr<device_buffer>& local_key, const std::shared_ptr<device_buffer>& layer_key)\r
+ \r
+ render_item create_render_item(const safe_ptr<device_buffer>& buffer, image_transform::blend_mode::type blend_mode)\r
{\r
- if(!std::all_of(item.textures.begin(), item.textures.end(), std::mem_fn(&device_buffer::ready)))\r
- {\r
- CASPAR_LOG(warning) << L"[image_mixer] Performance warning. Host to device transfer not complete, GPU will be stalled";\r
- channel_.ogl().yield(); // Try to give it some more time.\r
- } \r
+ CASPAR_ASSERT(buffer->stride() == 4 && "Only used for bgra textures");\r
\r
- kernel_.draw(channel_.ogl(), std::move(item), make_safe(draw_buffer), local_key, layer_key);\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.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
+ \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
safe_ptr<write_frame> create_frame(const void* tag, const core::pixel_format_desc& desc)\r
{\r
return make_safe<write_frame>(channel_.ogl(), tag, desc);\r
projects / casparcg / blobdiff