X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fbuffer_backend.cpp;h=c59540834615c61062ccd81ad33428fe90c764c4;hb=c356a20547afae97b412da36e0b0a7d51e879401;hp=ab78b1b5c3bd0b3b7fa63cb90e14d19ffc9de2f6;hpb=e70662d7812464159f2e47f4bebb69d88f89ae93;p=libs%2Fgl.git

diff --git a/source/backends/opengl/buffer_backend.cpp b/source/backends/opengl/buffer_backend.cpp
index ab78b1b5..c5954083 100644
--- a/source/backends/opengl/buffer_backend.cpp
+++ b/source/backends/opengl/buffer_backend.cpp
@@ -6,14 +6,13 @@
 #include <msp/gl/extensions/oes_mapbuffer.h>
 #include "buffer.h"
 #include "buffer_backend.h"
+#include "device.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-OpenGLBuffer *OpenGLBuffer::scratch_binding = 0;
-
 OpenGLBuffer::OpenGLBuffer()
 {
 	static Require _req(ARB_vertex_buffer_object);
@@ -32,7 +31,7 @@ OpenGLBuffer::OpenGLBuffer(OpenGLBuffer &&other):
 
 OpenGLBuffer::~OpenGLBuffer()
 {
-	if(this==scratch_binding)
+	if(this==Device::get_current().get_state().scratch_buffer)
 		unbind_scratch();
 	if(id)
 		glDeleteBuffers(1, &id);
@@ -40,7 +39,7 @@ OpenGLBuffer::~OpenGLBuffer()
 
 void OpenGLBuffer::allocate()
 {
-	size_t size = static_cast<const Buffer *>(this)->size;
+	size_t size = static_cast<const Buffer *>(this)->get_total_size();
 
 	if(ARB_buffer_storage)
 	{
@@ -91,7 +90,6 @@ void *OpenGLBuffer::map()
 
 bool OpenGLBuffer::unmap()
 {
-	// TODO check if it's mapped
 	if(ARB_direct_state_access)
 		return glUnmapNamedBuffer(id);
 	else if(OES_mapbuffer)
@@ -116,6 +114,7 @@ void OpenGLBuffer::set_debug_name(const string &name)
 
 void OpenGLBuffer::bind_scratch()
 {
+	const OpenGLBuffer *&scratch_binding = Device::get_current().get_state().scratch_buffer;
 	if(scratch_binding!=this)
 	{
 		glBindBuffer(GL_ARRAY_BUFFER, id);
@@ -125,6 +124,7 @@ void OpenGLBuffer::bind_scratch()
 
 void OpenGLBuffer::unbind_scratch()
 {
+	const OpenGLBuffer *&scratch_binding = Device::get_current().get_state().scratch_buffer;
 	if(scratch_binding)
 	{
 		glBindBuffer(GL_ARRAY_BUFFER, 0);
@@ -132,5 +132,16 @@ void OpenGLBuffer::unbind_scratch()
 	}
 }
 
+
+void Buffer::AsyncTransfer::allocate()
+{
+	dest_addr = buffer.map();
+}
+
+void Buffer::AsyncTransfer::finalize()
+{
+	buffer.unmap();
+}
+
 } // namespace GL
 } // namespace Msp