struct render_item\r
{\r
core::pixel_format_desc desc;\r
- std::vector<safe_ptr<host_buffer>> buffers;\r
+ std::vector<safe_ptr<device_buffer>> textures;\r
core::image_transform transform;\r
};\r
-\r
+ \r
+ std::vector<render_item> waiting_queue_;\r
std::vector<render_item> render_queue_;\r
\r
public:\r
auto gpu_frame = dynamic_cast<gpu_write_frame*>(&frame);\r
if(!gpu_frame)\r
return;\r
+ \r
+ auto desc = gpu_frame->get_pixel_format_desc();\r
+ auto buffers = gpu_frame->get_plane_buffers();\r
+ auto transform = transform_stack_.top();\r
\r
- render_item item;\r
+ ogl_device::begin_invoke([=]\r
+ {\r
+ render_item item;\r
\r
- item.desc = gpu_frame->get_pixel_format_desc();\r
- item.buffers = gpu_frame->get_plane_buffers();\r
- item.transform = transform_stack_.top();\r
+ item.desc = desc;\r
+ item.transform = transform;\r
+ \r
+ for(size_t n = 0; n < buffers.size(); ++n)\r
+ {\r
+ GL(glActiveTexture(GL_TEXTURE0+n));\r
+ auto texture = ogl_device::create_device_buffer(desc.planes[n].width, desc.planes[n].height, desc.planes[n].channels);\r
+ texture->read(*buffers[n]);\r
+ item.textures.push_back(texture);\r
+ } \r
\r
- render_queue_.push_back(item);\r
+ waiting_queue_.push_back(item);\r
+ });\r
}\r
\r
void end()\r
\r
boost::unique_future<safe_ptr<const host_buffer>> render()\r
{\r
- auto queue = render_queue_;\r
- render_queue_.clear();\r
- return ogl_device::begin_invoke([=]() -> safe_ptr<const host_buffer>\r
+ auto result = ogl_device::begin_invoke([=]() -> safe_ptr<const host_buffer>\r
+ {\r
+ reading_->map(); // Might block.\r
+ return make_safe(reading_);\r
+ });\r
+ \r
+ ogl_device::begin_invoke([=]\r
{\r
is_key_ = false;\r
+\r
+ // Clear and bind frame-buffers.\r
+\r
key_target_->attach();\r
GL(glClear(GL_COLOR_BUFFER_BIT)); \r
\r
- // START_PASS\r
- auto result = reading_;\r
- result->map();\r
render_targets_[0]->attach();\r
GL(glClear(GL_COLOR_BUFFER_BIT));\r
\r
- BOOST_FOREACH(auto item, queue)\r
+ // Render items.\r
+\r
+ BOOST_FOREACH(auto item, render_queue_)\r
render(item); \r
\r
- // END PASS\r
+ // Move waiting items to queue.\r
+\r
+ render_queue_ = std::move(waiting_queue_);\r
+\r
+ // Start read-back.\r
+\r
reading_ = ogl_device::create_host_buffer(format_desc_.size, host_buffer::read_only);\r
render_targets_[0]->attach();\r
render_targets_[0]->write(*reading_);\r
- std::rotate(render_targets_.begin(), render_targets_.begin() + 1, render_targets_.end());\r
-\r
- return make_safe(result);\r
+ std::swap(render_targets_[0], render_targets_[1]);\r
});\r
+\r
+ return std::move(result);\r
}\r
\r
void render(const render_item& item)\r
{ \r
const auto desc = item.desc;\r
- auto buffers = item.buffers;\r
+ auto textures = item.textures;\r
const auto transform = item.transform;\r
\r
+ // Bind textures\r
+\r
+ for(size_t n = 0; n < textures.size(); ++n)\r
+ {\r
+ GL(glActiveTexture(GL_TEXTURE0+n));\r
+ textures[n]->bind();\r
+ } \r
+\r
// Setup key and kernel\r
\r
+ bool has_separate_key = false;\r
+\r
if(transform.get_is_key())\r
{\r
- kernel_.apply(desc, transform, false);\r
if(!is_key_)\r
{\r
key_target_->attach();\r
} \r
else\r
{ \r
- kernel_.apply(desc, transform, is_key_); \r
if(is_key_)\r
{\r
- if(buffers.size() == 4)\r
- buffers.pop_back();\r
+ has_separate_key = true;\r
is_key_ = false;\r
\r
render_targets_[0]->attach(); \r
} \r
} \r
\r
- // Bind textures\r
+ // Draw\r
\r
- std::vector<safe_ptr<device_buffer>> textures;\r
- for(size_t n = 0; n < buffers.size(); ++n)\r
- {\r
- GL(glActiveTexture(GL_TEXTURE0+n));\r
- auto texture = ogl_device::create_device_buffer(desc.planes[n].width, desc.planes[n].height, desc.planes[n].channels);\r
- texture->read(*buffers[n]);\r
- texture->bind();\r
- textures.push_back(texture);\r
- } \r
-\r
- GL(glColor4d(1.0, 1.0, 1.0, transform.get_opacity()));\r
- GL(glViewport(0, 0, format_desc_.width, format_desc_.height));\r
- \r
- auto m_p = transform.get_key_translation();\r
- auto m_s = transform.get_key_scale();\r
- double w = static_cast<double>(format_desc_.width);\r
- double h = static_cast<double>(format_desc_.height);\r
-\r
- GL(glEnable(GL_SCISSOR_TEST));\r
- GL(glScissor(static_cast<size_t>(m_p[0]*w), static_cast<size_t>(m_p[1]*h), static_cast<size_t>(m_s[0]*w), static_cast<size_t>(m_s[1]*h)));\r
- \r
- auto f_p = transform.get_fill_translation();\r
- auto f_s = transform.get_fill_scale();\r
- \r
- glBegin(GL_QUADS);\r
- glMultiTexCoord2d(GL_TEXTURE0, 0.0, 0.0); glMultiTexCoord2d(GL_TEXTURE1, f_p[0] , f_p[1] ); glVertex2d( f_p[0] *2.0-1.0, f_p[1] *2.0-1.0);\r
- glMultiTexCoord2d(GL_TEXTURE0, 1.0, 0.0); glMultiTexCoord2d(GL_TEXTURE1, (f_p[0]+f_s[0]), f_p[1] ); glVertex2d((f_p[0]+f_s[0])*2.0-1.0, f_p[1] *2.0-1.0);\r
- glMultiTexCoord2d(GL_TEXTURE0, 1.0, 1.0); glMultiTexCoord2d(GL_TEXTURE1, (f_p[0]+f_s[0]), (f_p[1]+f_s[1])); glVertex2d((f_p[0]+f_s[0])*2.0-1.0, (f_p[1]+f_s[1])*2.0-1.0);\r
- glMultiTexCoord2d(GL_TEXTURE0, 0.0, 1.0); glMultiTexCoord2d(GL_TEXTURE1, f_p[0] , (f_p[1]+f_s[1])); glVertex2d( f_p[0] *2.0-1.0, (f_p[1]+f_s[1])*2.0-1.0);\r
- glEnd();\r
- GL(glDisable(GL_SCISSOR_TEST)); \r
+ kernel_.draw(format_desc_.width, format_desc_.height, desc, transform, has_separate_key); \r
}\r
\r
std::vector<safe_ptr<host_buffer>> create_buffers(const core::pixel_format_desc& format)\r
projects / casparcg / blobdiff