2.0. Fixed mix transition.

[casparcg] / core / mixer / gpu / ogl_device.h

diff --git a/core/mixer/gpu/ogl_device.h b/core/mixer/gpu/ogl_device.h
index 6c44257609e2bb6f48294229a1055ea05d27fe19..d1fb65b2dae6e442bd4220c2387b7a904e8d75c7 100644 (file)
--- a/core/mixer/gpu/ogl_device.h
+++ b/core/mixer/gpu/ogl_device.h
@@ -45,14 +45,12 @@ class shader;
 template<typename T>\r
 struct buffer_pool\r
 {\r
-       tbb::atomic<int> total_count;\r
        tbb::atomic<int> usage_count;\r
        tbb::atomic<int> flush_count;\r
        tbb::concurrent_bounded_queue<std::shared_ptr<T>> items;\r
 \r
        buffer_pool()\r
        {\r
-               total_count = 0;\r
                usage_count = 0;\r
                flush_count = 0;\r
        }\r
@@ -67,6 +65,7 @@ class ogl_device : boost::noncopyable
        GLint                                                    attached_texture_;\r
        GLint                                                    active_shader_;\r
        std::array<GLint, 16>                    binded_textures_;\r
+       std::array<GLint, 4>                     blend_func_;\r
 \r
        std::unique_ptr<sf::Context> context_;\r
        \r
@@ -93,6 +92,9 @@ public:
 \r
        void begin_read(host_buffer& dest, device_buffer& source);\r
        void begin_read(device_buffer& dest, host_buffer& source);\r
+\r
+       void blend_func(int c1, int c2, int a1, int a2);\r
+       void blend_func(int c1, int c2);\r
        \r
        void use(shader& shader);\r
 \r