2.0. ogl_device: Optimized return of device_buffers.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@892 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/mixer/gpu/ogl_device.cpp b/core/mixer/gpu/ogl_device.cpp
index 9e32ced2b1f1d96522fc16c2b35e88fec4919982..85f9638d598a70b23c9fbda53425927b7230a049 100644 (file)
--- a/core/mixer/gpu/ogl_device.cpp
+++ b/core/mixer/gpu/ogl_device.cpp
@@ -78,11 +78,7 @@ safe_ptr<device_buffer> ogl_device::create_device_buffer(size_t width, size_t he
                        \r
        return safe_ptr<device_buffer>(buffer.get(), [=](device_buffer*)\r
        {\r
-               executor_.begin_invoke([=] // Execute in ogl context in order to guarantee destruction of buffer in ogl context.\r
-               {\r
-                       pool->push(buffer);\r
-\r
-               }, high_priority);\r
+               pool->push(buffer);\r
        });\r
 }\r
        \r

diff --git a/protocol/StdAfx.h b/protocol/StdAfx.h
index d9ad11aec123b381578b67fece6961b27c50224f..e8440258eb7600b7cfc2fc1ca333786e984df028 100644 (file)
--- a/protocol/StdAfx.h
+++ b/protocol/StdAfx.h
@@ -25,8 +25,6 @@
 \r
 #pragma once\r
 \r
-#include "../common/compiler/vs/disable_silly_warnings.h"\r
-\r
 #define NOMINMAX\r
 \r
 #if defined(_MSC_VER)\r