]> 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, 9 Mar 2012 21:00:20 +0000 (21:00 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 9 Mar 2012 21:00:20 +0000 (21:00 +0000)
accelerator/ogl/image/image_kernel.cpp

index 331a316d7b66b2369bc0cab07bb1e90bb8d074c6..831b74223e65153c34d7d92aff9601ef145c0af5 100644 (file)
@@ -57,7 +57,7 @@ GLubyte lower_pattern[] = {
 struct image_kernel::impl\r
 {      \r
        spl::shared_ptr<device> ogl_;\r
-       spl::shared_ptr<shader>         shader_;\r
+       spl::shared_ptr<shader> shader_;\r
        bool                                    blend_modes_;\r
                                                        \r
        impl(const spl::shared_ptr<device>& ogl)\r
@@ -118,7 +118,7 @@ struct image_kernel::impl
 \r
                if(blend_modes_)\r
                {\r
-                       params.background->bind(6);\r
+                       params.background->bind(texture_id::background);\r
 \r
                        shader_->set("background",      texture_id::background);\r
                        shader_->set("blend_mode",      params.blend_mode.value());\r