]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 16 Aug 2011 08:56:25 +0000 (08:56 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 16 Aug 2011 08:56:25 +0000 (08:56 +0000)
core/mixer/image/image_mixer.cpp

index a352578fd2de64f61f6baf92bc2a6eae466f2c0c..2784cc52cf19a19a0f1087965812d621b1f0954a 100644 (file)
@@ -62,6 +62,8 @@ struct image_mixer::implementation : boost::noncopyable
        std::deque<std::deque<render_item>>             layers_; // layer/stream/items\r
        \r
        image_kernel                                                    kernel_;                \r
+\r
+       std::shared_ptr<device_buffer>                  active_buffer_;\r
 public:\r
        implementation(video_channel_context& video_channel) \r
                : channel_(video_channel)\r
@@ -129,11 +131,13 @@ public:
                                \r
                BOOST_FOREACH(auto& layer, layers)\r
                        draw(std::move(layer), draw_buffer, layer_key_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
                \r
+               active_buffer_ = draw_buffer;\r
+\r
                GL(glFlush());\r
                \r
                return host_buffer;\r