]> git.sesse.net Git - casparcg/commitdiff
2.1.0: -device: Fixed incorrect naming.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 4 Apr 2012 08:46:41 +0000 (08:46 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 4 Apr 2012 08:46:41 +0000 (08:46 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2789 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

accelerator/ogl/util/device.cpp

index 68ed4c3581805d8e802db999280d96ce6ccd97c2..2b14ed8ceb874e72f9a1f8b1e743deaf07ae83d7 100644 (file)
@@ -165,16 +165,16 @@ struct device::impl : public std::enable_shared_from_this<impl>
                                        \r
                auto pool = &device_pools_[stride-1][((width << 16) & 0xFFFF0000) | (height & 0x0000FFFF)];\r
                \r
-               std::shared_ptr<texture> buffer;\r
-               if(!pool->try_pop(buffer))              \r
-                       buffer = spl::make_shared<texture>(width, height, stride);\r
+               std::shared_ptr<texture> tex;\r
+               if(!pool->try_pop(tex))         \r
+                       tex = spl::make_shared<texture>(width, height, stride);\r
        \r
                if(clear)\r
-                       buffer->clear();\r
+                       tex->clear();\r
 \r
-               return spl::shared_ptr<texture>(buffer.get(), [buffer, pool](texture*) mutable\r
+               return spl::shared_ptr<texture>(tex.get(), [tex, pool](texture*) mutable\r
                {               \r
-                       pool->push(buffer);     \r
+                       pool->push(tex);        \r
                });\r
        }\r
                \r