git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 5d4507a8701e6bbe683149c594f9425fb7cd346a..25b2352887132a0597639825d32404f9374eb33f 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -80,7 +80,7 @@ public:
 private:\r
        safe_ptr<host_buffer> do_render(std::vector<layer>&& layers)\r
        {\r
-               auto draw_buffer = create_device_buffer(4);\r
+               auto draw_buffer = create_mixer_buffer(4);\r
 \r
                if(channel_.get_format_desc().field_mode != field_mode::progressive)\r
                {\r
@@ -141,20 +141,20 @@ private:
                                \r
                if(layer.first != blend_mode::normal && layer.second.size() > 1)\r
                {\r
-                       auto layer_draw_buffer = create_device_buffer(4);\r
+                       auto layer_draw_buffer = create_mixer_buffer(4);\r
 \r
                        BOOST_FOREACH(auto& item, layer.second)\r
                                draw_item(std::move(item), layer_draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer);    \r
                \r
-                       draw_device_buffer(layer_draw_buffer, std::move(local_mix_buffer), blend_mode::normal);                                                 \r
-                       draw_device_buffer(draw_buffer, std::move(layer_draw_buffer), layer.first);\r
+                       draw_mixer_buffer(layer_draw_buffer, std::move(local_mix_buffer), blend_mode::normal);                                                  \r
+                       draw_mixer_buffer(draw_buffer, std::move(layer_draw_buffer), layer.first);\r
                }\r
                else // fast path\r
                {\r
                        BOOST_FOREACH(auto& item, layer.second)         \r
                                draw_item(std::move(item), draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer);          \r
                                        \r
-                       draw_device_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);\r
+                       draw_mixer_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);\r
                }                                       \r
 \r
                std::swap(local_key_buffer, layer_key_buffer);\r
@@ -173,7 +173,7 @@ private:
 \r
                if(item.transform.is_key)\r
                {\r
-                       local_key_buffer = local_key_buffer ? local_key_buffer : create_device_buffer(1);\r
+                       local_key_buffer = local_key_buffer ? local_key_buffer : create_mixer_buffer(1);\r
 \r
                        draw_params.background                  = local_key_buffer;\r
                        draw_params.local_key                   = nullptr;\r
@@ -183,7 +183,7 @@ private:
                }\r
                else if(item.transform.is_mix)\r
                {\r
-                       local_mix_buffer = local_mix_buffer ? local_mix_buffer : create_device_buffer(4);\r
+                       local_mix_buffer = local_mix_buffer ? local_mix_buffer : create_mixer_buffer(4);\r
 \r
                        draw_params.background                  = local_mix_buffer;\r
                        draw_params.local_key                   = std::move(local_key_buffer);\r
@@ -195,7 +195,7 @@ private:
                }\r
                else\r
                {\r
-                       draw_device_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);\r
+                       draw_mixer_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);\r
                        \r
                        draw_params.background                  = draw_buffer;\r
                        draw_params.local_key                   = std::move(local_key_buffer);\r
@@ -205,7 +205,7 @@ private:
                }       \r
        }\r
 \r
-       void draw_device_buffer(safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>&& source_buffer, blend_mode::type blend_mode = blend_mode::normal)\r
+       void draw_mixer_buffer(safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>&& source_buffer, blend_mode::type blend_mode = blend_mode::normal)\r
        {\r
                if(!source_buffer)\r
                        return;\r
@@ -221,7 +221,7 @@ private:
                kernel_.draw(channel_.ogl(), std::move(draw_params));\r
        }\r
                        \r
-       safe_ptr<device_buffer> create_device_buffer(size_t stride)\r
+       safe_ptr<device_buffer> create_mixer_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
                channel_.ogl().clear(*buffer);\r