#include <common/gl/gl_check.h>\r
\r
#include <boost/foreach.hpp>\r
+#include <boost/property_tree/ptree.hpp>\r
\r
#include <gl/glew.h>\r
\r
});\r
}\r
\r
-safe_ptr<device_buffer> ogl_device::allocate_device_buffer(size_t width, size_t height, size_t stride)\r
+safe_ptr<device_buffer> ogl_device::allocate_device_buffer(size_t width, size_t height, size_t stride, bool mipmapped)\r
{\r
std::shared_ptr<device_buffer> buffer;\r
try\r
{\r
- buffer.reset(new device_buffer(width, height, stride));\r
+ buffer.reset(new device_buffer(width, height, stride, mipmapped));\r
}\r
catch(...)\r
{\r
gc().wait();\r
\r
// Try again\r
- buffer.reset(new device_buffer(width, height, stride));\r
+ buffer.reset(new device_buffer(width, height, stride, mipmapped));\r
}\r
catch(...)\r
{\r
return make_safe_ptr(buffer);\r
}\r
\r
-safe_ptr<device_buffer> ogl_device::create_device_buffer(size_t width, size_t height, size_t stride)\r
+safe_ptr<device_buffer> ogl_device::create_device_buffer(size_t width, size_t height, size_t stride, bool mipmapped)\r
{\r
CASPAR_VERIFY(stride > 0 && stride < 5);\r
CASPAR_VERIFY(width > 0 && height > 0);\r
- auto& pool = device_pools_[stride-1][((width << 16) & 0xFFFF0000) | (height & 0x0000FFFF)];\r
+ auto& pool = device_pools_[stride-1 + (mipmapped ? 4 : 0)][((width << 16) & 0xFFFF0000) | (height & 0x0000FFFF)];\r
std::shared_ptr<device_buffer> buffer;\r
if(!pool->items.try_pop(buffer)) \r
- buffer = executor_.invoke([&]{return allocate_device_buffer(width, height, stride);}, high_priority); \r
+ buffer = executor_.invoke([&]{return allocate_device_buffer(width, height, stride, mipmapped);}, high_priority); \r
\r
//++pool->usage_count;\r
\r
executor_.yield();\r
}\r
\r
+boost::property_tree::wptree ogl_device::info() const\r
+{\r
+ boost::property_tree::wptree info;\r
+\r
+ boost::property_tree::wptree pooled_device_buffers;\r
+ size_t total_pooled_device_buffer_size = 0;\r
+ size_t total_pooled_device_buffer_count = 0;\r
+\r
+ for (size_t i = 0; i < device_pools_.size(); ++i)\r
+ {\r
+ auto& pools = device_pools_.at(i);\r
+ bool mipmapping = i > 3;\r
+ int stride = mipmapping ? i - 3 : i + 1;\r
+\r
+ BOOST_FOREACH(auto& pool, pools)\r
+ {\r
+ auto width = pool.first >> 16;\r
+ auto height = pool.first & 0x0000FFFF;\r
+ auto size = width * height * stride;\r
+ auto count = pool.second->items.size();\r
+\r
+ if (count == 0)\r
+ continue;\r
+\r
+ boost::property_tree::wptree pool_info;\r
+\r
+ pool_info.add(L"stride", stride);\r
+ pool_info.add(L"mipmapping", mipmapping);\r
+ pool_info.add(L"width", width);\r
+ pool_info.add(L"height", height);\r
+ pool_info.add(L"size", size);\r
+ pool_info.add(L"count", count);\r
+\r
+ total_pooled_device_buffer_size += size * count;\r
+ total_pooled_device_buffer_count += count;\r
+\r
+ pooled_device_buffers.add_child(L"device_buffer_pool", pool_info);\r
+ }\r
+ }\r
+\r
+ info.add_child(L"gl.details.pooled_device_buffers", pooled_device_buffers);\r
+\r
+ boost::property_tree::wptree pooled_host_buffers;\r
+ size_t total_read_size = 0;\r
+ size_t total_write_size = 0;\r
+ size_t total_read_count = 0;\r
+ size_t total_write_count = 0;\r
+\r
+ for (size_t i = 0; i < host_pools_.size(); ++i)\r
+ {\r
+ auto& pools = host_pools_.at(i);\r
+ host_buffer::usage_t usage = static_cast<host_buffer::usage_t>(i);\r
+\r
+ BOOST_FOREACH(auto& pool, pools)\r
+ {\r
+ auto size = pool.first;\r
+ auto count = pool.second->items.size();\r
+\r
+ if (count == 0)\r
+ continue;\r
+\r
+ boost::property_tree::wptree pool_info;\r
+\r
+ pool_info.add(L"usage", usage == host_buffer::read_only\r
+ ? L"read_only" : L"write_only");\r
+ pool_info.add(L"size", size);\r
+ pool_info.add(L"count", count);\r
+\r
+ pooled_host_buffers.add_child(L"host_buffer_pool", pool_info);\r
+\r
+ (usage == host_buffer::read_only\r
+ ? total_read_count : total_write_count) += count;\r
+ (usage == host_buffer::read_only\r
+ ? total_read_size : total_write_size) += size * count;\r
+ }\r
+ }\r
+\r
+ info.add_child(L"gl.details.pooled_host_buffers", pooled_host_buffers);\r
+\r
+ info.add(L"gl.summary.pooled_device_buffers.total_count", total_pooled_device_buffer_count);\r
+ info.add(L"gl.summary.pooled_device_buffers.total_size", total_pooled_device_buffer_size);\r
+ info.add_child(L"gl.summary.all_device_buffers", device_buffer::info());\r
+ info.add(L"gl.summary.pooled_host_buffers.total_read_count", total_read_count);\r
+ info.add(L"gl.summary.pooled_host_buffers.total_write_count", total_write_count);\r
+ info.add(L"gl.summary.pooled_host_buffers.total_read_size", total_read_size);\r
+ info.add(L"gl.summary.pooled_host_buffers.total_write_size", total_write_size);\r
+ info.add_child(L"gl.summary.all_host_buffers", host_buffer::info());\r
+\r
+ return info;\r
+}\r
+\r
boost::unique_future<void> ogl_device::gc()\r
{ \r
return begin_invoke([=]\r