X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Ftexture2d_backend.cpp;h=ab0c6d8cfb48ccf484da7d596fe8adf84ec07cf1;hb=c218e021ede4e91c0fbc22ea9d636283409f847f;hp=45ba78cc8f6f10c1e4e8d3b7d372b82b148843f0;hpb=6080120777fdf7b6e1184288eff9d205ca7ebf5f;p=libs%2Fgl.git

diff --git a/source/backends/opengl/texture2d_backend.cpp b/source/backends/opengl/texture2d_backend.cpp
index 45ba78cc..ab0c6d8c 100644
--- a/source/backends/opengl/texture2d_backend.cpp
+++ b/source/backends/opengl/texture2d_backend.cpp
@@ -41,9 +41,7 @@ OpenGLTexture2D::OpenGLTexture2D():
 
 void OpenGLTexture2D::allocate()
 {
-	unsigned width = static_cast<const Texture2D *>(this)->width;
-	unsigned height = static_cast<const Texture2D *>(this)->height;
-	unsigned levels = static_cast<const Texture2D *>(this)->levels;
+	const Texture2D &self = *static_cast<const Texture2D *>(this);
 
 	if(!id)
 		create();
@@ -52,22 +50,22 @@ void OpenGLTexture2D::allocate()
 	if(ARB_texture_storage)
 	{
 		if(ARB_direct_state_access)
-			glTextureStorage2D(id, levels, gl_fmt, width, height);
+			glTextureStorage2D(id, n_levels, gl_fmt, self.width, self.height);
 		else
 		{
 			bind_scratch();
-			glTexStorage2D(target, levels, gl_fmt, width, height);
+			glTexStorage2D(target, n_levels, gl_fmt, self.width, self.height);
 		}
 	}
 	else
 	{
 		bind_scratch();
-		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, n_levels-1);
 		GLenum comp = get_gl_components(get_components(storage_fmt));
 		GLenum type = get_gl_type(get_component_type(storage_fmt));
-		for(unsigned i=0; i<levels; ++i)
+		for(unsigned i=0; i<n_levels; ++i)
 		{
-			auto lv_size = static_cast<const Texture2D *>(this)->get_level_size(i);
+			auto lv_size = self.get_level_size(i);
 			glTexImage2D(target, i, gl_fmt, lv_size.x, lv_size.y, 0, comp, type, 0);
 		}
 	}
@@ -105,13 +103,11 @@ uint64_t OpenGLTexture2D::get_data_size() const
 	if(!id)
 		return 0;
 
-	unsigned width = static_cast<const Texture2D *>(this)->width;
-	unsigned height = static_cast<const Texture2D *>(this)->height;
-	unsigned levels = static_cast<const Texture2D *>(this)->levels;
+	const Texture2D &self = *static_cast<const Texture2D *>(this);
 
-	size_t level_size = width*height*get_pixel_size(format);
+	size_t level_size = self.width*self.height*get_pixel_size(format);
 	size_t total_size = level_size;
-	for(unsigned i=0; i<levels; ++i, level_size>>=2)
+	for(unsigned i=0; i<n_levels; ++i, level_size>>=2)
 		total_size += level_size;
 	return total_size;
 }
@@ -123,6 +119,47 @@ void OpenGLTexture2D::unload()
 }
 
 
+OpenGLTexture2D::AsyncTransfer::AsyncTransfer(AsyncTransfer &&other):
+	pixel_buffer(other.pixel_buffer)
+{
+	other.pixel_buffer = 0;
+}
+
+OpenGLTexture2D::AsyncTransfer &OpenGLTexture2D::AsyncTransfer::operator=(AsyncTransfer &&other)
+{
+	delete pixel_buffer;
+	pixel_buffer = other.pixel_buffer;
+	other.pixel_buffer = 0;
+
+	return *this;
+}
+
+OpenGLTexture2D::AsyncTransfer::~AsyncTransfer()
+{
+	delete pixel_buffer;
+}
+
+void *OpenGLTexture2D::AsyncTransfer::allocate()
+{
+	const Texture2D::AsyncTransfer &self = *static_cast<const Texture2D::AsyncTransfer *>(this);
+
+	pixel_buffer = new Buffer;
+	pixel_buffer->storage(self.data_size, STREAMING);
+	return pixel_buffer->map();
+}
+
+void OpenGLTexture2D::AsyncTransfer::finalize()
+{
+	const Texture2D::AsyncTransfer &self = *static_cast<const Texture2D::AsyncTransfer *>(this);
+
+	pixel_buffer->unmap();
+
+	glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pixel_buffer->id);
+	self.texture->OpenGLTexture2D::sub_image(self.level, self.x, self.y, self.width, self.height, 0);
+	glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+}
+
+
 OpenGLTexture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
 	texture(t),
 	io(i)