]> 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>
Fri, 19 Aug 2011 14:14:46 +0000 (14:14 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 19 Aug 2011 14:14:46 +0000 (14:14 +0000)
core/mixer/image/image_kernel.cpp

index b2b03475b91a9921da250a23018d926bac20643d..bd75820e058b4d51ccf19540ed62e6f5af763d27 100644 (file)
@@ -59,7 +59,7 @@ GLubyte lower_pattern[] = {
 struct image_kernel::implementation : boost::noncopyable\r
 {      \r
        std::shared_ptr<shader> shader_;\r
-       bool                                    blend_modes_;\r
+       bool                                    advanced_blend_modes_;\r
                                                        \r
        void draw(ogl_device&                                                                   ogl,\r
                          render_item&&                                                                 item,\r
@@ -97,7 +97,7 @@ struct image_kernel::implementation : boost::noncopyable
                // Setup shader\r
 \r
                if(!shader_)\r
-                       shader_ = get_image_shader(ogl, blend_modes_);\r
+                       shader_ = get_image_shader(ogl, advanced_blend_modes_);\r
                                                \r
                ogl.use(*shader_);\r
 \r
@@ -114,7 +114,7 @@ struct image_kernel::implementation : boost::noncopyable
                \r
                // Setup blend_func\r
                \r
-               if(blend_modes_)\r
+               if(advanced_blend_modes_)\r
                {\r
                        background->bind(6);\r
 \r
@@ -230,7 +230,7 @@ struct image_kernel::implementation : boost::noncopyable
                item.textures.clear();\r
                ogl.yield(); // Return resources to pool as early as possible.\r
 \r
-               if(blend_modes_)\r
+               if(advanced_blend_modes_)\r
                {\r
                        // http://www.opengl.org/registry/specs/NV/texture_barrier.txt\r
                        // This allows us to use framebuffer (background) both as source and target while blending.\r