git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / core / mixer / gpu / device_buffer.cpp

diff --git a/core/mixer/gpu/device_buffer.cpp b/core/mixer/gpu/device_buffer.cpp
index 891fd6faa17fd5d87aa83e7f38307510abf4bd55..a50c79399994fe3aa432b5530d2bf84b6b661224 100644 (file)
--- a/core/mixer/gpu/device_buffer.cpp
+++ b/core/mixer/gpu/device_buffer.cpp
@@ -21,14 +21,26 @@
 \r
 #include "device_buffer.h"\r
 \r
-#include "host_buffer.h"\r
+#include "fence.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
-GLenum FORMAT[] = {0, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_BGR, GL_BGRA};\r
-GLenum INTERNAL_FORMAT[] = {0, GL_LUMINANCE8, GL_LUMINANCE8_ALPHA8, GL_RGB8, GL_RGBA8};        \r
+static GLenum FORMAT[] = {0, GL_RED, GL_RG, GL_BGR, GL_BGRA};\r
+static GLenum INTERNAL_FORMAT[] = {0, GL_R8, GL_RG8, GL_RGB8, GL_RGBA8};       \r
+\r
+unsigned int format(size_t stride)\r
+{\r
+       return FORMAT[stride];\r
+}\r
+\r
+static tbb::atomic<int> g_total_count;\r
 \r
 struct device_buffer::implementation : boost::noncopyable\r
 {\r
@@ -38,6 +50,8 @@ struct device_buffer::implementation : boost::noncopyable
        const size_t height_;\r
        const size_t stride_;\r
 \r
+       fence            fence_;\r
+\r
 public:\r
        implementation(size_t width, size_t height, size_t stride) \r
                : width_(width)\r
@@ -52,8 +66,7 @@ public:
                GL(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));\r
                GL(glTexImage2D(GL_TEXTURE_2D, 0, INTERNAL_FORMAT[stride_], width_, height_, 0, FORMAT[stride_], GL_UNSIGNED_BYTE, NULL));\r
                GL(glBindTexture(GL_TEXTURE_2D, 0));\r
-               CASPAR_LOG(debug) << "[device_buffer] allocated size:" << width*height*stride;  \r
-               clear();\r
+               CASPAR_LOG(trace) << "[device_buffer] [" << ++g_total_count << L"] allocated size:" << width*height*stride;     \r
        }       \r
 \r
        ~implementation()\r
@@ -61,6 +74,7 @@ public:
                try\r
                {\r
                        GL(glDeleteTextures(1, &id_));\r
+                       //CASPAR_LOG(trace) << "[device_buffer] [" << --g_total_count << L"] deallocated size:" << width_*height_*stride_;\r
                }\r
                catch(...)\r
                {\r
@@ -84,38 +98,17 @@ public:
                GL(glBindTexture(GL_TEXTURE_2D, 0));\r
        }\r
 \r
-       void read(host_buffer& source)\r
+       void begin_read()\r
        {\r
-               GL(glBindTexture(GL_TEXTURE_2D, id_));\r
-               source.unmap();\r
-               source.bind();\r
+               bind();\r
                GL(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width_, height_, FORMAT[stride_], GL_UNSIGNED_BYTE, NULL));\r
-               source.unbind();\r
-               GL(glBindTexture(GL_TEXTURE_2D, 0));\r
+               unbind();\r
+               fence_.set();\r
        }\r
        \r
-       void write(host_buffer& target)\r
+       bool ready() const\r
        {\r
-               attach(0);\r
-               GL(glBindTexture(GL_TEXTURE_2D, id_));\r
-               target.unmap();\r
-               target.bind();\r
-               GL(glReadPixels(0, 0, width_, height_, FORMAT[stride_], GL_UNSIGNED_BYTE, NULL));\r
-               target.unbind();\r
-               GL(glBindTexture(GL_TEXTURE_2D, 0));\r
-               target.fence_set();\r
-               glFlush();\r
-       }\r
-\r
-       void attach(int index)\r
-       {\r
-               GL(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + index, GL_TEXTURE_2D, id_, 0));\r
-       }\r
-\r
-       void clear()\r
-       {\r
-               attach(0);\r
-               GL(glClear(GL_COLOR_BUFFER_BIT));\r
+               return fence_.ready();\r
        }\r
 };\r
 \r
@@ -123,12 +116,11 @@ device_buffer::device_buffer(size_t width, size_t height, size_t stride) : impl_
 size_t device_buffer::stride() const { return impl_->stride_; }\r
 size_t device_buffer::width() const { return impl_->width_; }\r
 size_t device_buffer::height() const { return impl_->height_; }\r
-void device_buffer::attach(int index){impl_->attach(index);}\r
-void device_buffer::bind(){impl_->bind();}\r
 void device_buffer::bind(int index){impl_->bind(index);}\r
 void device_buffer::unbind(){impl_->unbind();}\r
-void device_buffer::read(host_buffer& source){impl_->read(source);}\r
-void device_buffer::write(host_buffer& target){impl_->write(target);}\r
-void device_buffer::clear(){impl_->clear();}\r
+void device_buffer::begin_read(){impl_->begin_read();}\r
+bool device_buffer::ready() const{return impl_->ready();}\r
+int device_buffer::id() const{ return impl_->id_;}\r
+\r
 \r
 }}
\ No newline at end of file