#include "device_buffer.h"\r
#include "ogl_device.h"\r
\r
+#include <common/exception/exceptions.h>\r
#include <common/gl/gl_check.h>\r
\r
+#include <gl/glew.h>\r
+\r
+#include <tbb/atomic.h>\r
+\r
namespace caspar { namespace core {\r
+\r
+static tbb::atomic<int> g_w_total_count;\r
+static tbb::atomic<int> g_r_total_count;\r
\r
struct host_buffer::implementation : boost::noncopyable\r
{ \r
if(!pbo_)\r
BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Failed to allocate buffer."));\r
\r
- CASPAR_LOG(debug) << "[host_buffer] allocated size:" << size_ << " usage: " << (usage == write_only ? "write_only" : "read_only");\r
+ CASPAR_LOG(trace) << "[host_buffer] [" << ++(usage_ == write_only ? g_w_total_count : g_r_total_count) << L"] allocated size:" << size_ << " usage: " << (usage == write_only ? "write_only" : "read_only");\r
} \r
\r
~implementation()\r
try\r
{\r
GL(glDeleteBuffers(1, &pbo_));\r
+ //CASPAR_LOG(trace) << "[host_buffer] [" << --(usage_ == write_only ? g_w_total_count : g_r_total_count) << L"] deallocated size:" << size_ << " usage: " << (usage_ == write_only ? "write_only" : "read_only");\r
}\r
catch(...)\r
{\r
GL(glBindBuffer(target_, 0));\r
}\r
\r
- void begin_read(device_buffer& source)\r
+ void begin_read(size_t width, size_t height, GLuint format)\r
{\r
- source.attach(0);\r
- source.bind();\r
unmap();\r
bind();\r
- GL(glReadPixels(0, 0, source.width(), source.height(), format(source.stride()), GL_UNSIGNED_BYTE, NULL));\r
+ GL(glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, NULL));\r
unbind();\r
- source.unbind();\r
fence_.set();\r
- //GL(glFlush());\r
}\r
\r
bool ready() const\r
void host_buffer::unmap(){impl_->unmap();}\r
void host_buffer::bind(){impl_->bind();}\r
void host_buffer::unbind(){impl_->unbind();}\r
-void host_buffer::begin_read(device_buffer& source){impl_->begin_read(source);}\r
+void host_buffer::begin_read(size_t width, size_t height, GLuint format){impl_->begin_read(width, height, format);}\r
size_t host_buffer::size() const { return impl_->size_; }\r
bool host_buffer::ready() const{return impl_->ready();}\r
void host_buffer::wait(ogl_device& ogl){impl_->wait(ogl);}\r