X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.cpp;h=74071535e73f41e768f053cd5041479fe80353c3;hb=c218e021ede4e91c0fbc22ea9d636283409f847f;hp=01612d7325a8bf21c875e6e5a7de4f3de461657d;hpb=ef650a483b4201a1e9727f9a86e59894344d30e8;p=libs%2Fgl.git

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index 01612d73..74071535 100644
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -6,11 +6,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Texture2D::Texture2D():
-	width(0),
-	height(0)
-{ }
-
 Texture2D::~Texture2D()
 {
 	set_manager(0);
@@ -20,7 +15,7 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
 {
 	if(width>0)
 	{
-		if(fmt!=format || wd!=width || ht!=height || (lv && lv!=levels))
+		if(fmt!=format || wd!=width || ht!=height || (lv && lv!=n_levels))
 			throw incompatible_data("Texture2D::storage");
 		return;
 	}
@@ -30,9 +25,9 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
 	set_format(fmt);
 	width = wd;
 	height = ht;
-	levels = get_n_levels();
+	n_levels = count_levels(max(width, height));
 	if(lv>0)
-		levels = min(levels, lv);
+		n_levels = min(n_levels, lv);
 
 	allocate();
 }
@@ -43,27 +38,25 @@ void Texture2D::image(unsigned level, const void *data)
 	return sub_image(level, 0, 0, size.x, size.y, data);
 }
 
-void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
+void Texture2D::sub_image(unsigned level, unsigned x, unsigned y, unsigned wd, unsigned ht, const void *data)
 {
 	if(width==0 || height==0)
 		throw invalid_operation("Texture2D::sub_image");
-	if(level>=levels)
+	if(level>=n_levels || x>width || x+wd>width || y>height || y+ht>height)
 		throw out_of_range("Texture2D::sub_image");
 
 	Texture2DBackend::sub_image(level, x, y, wd, ht, data);
 }
 
-void Texture2D::image(const Graphics::Image &img, unsigned lv)
+Texture2D::AsyncTransfer Texture2D::sub_image_async(unsigned level, unsigned x, unsigned y, unsigned wd, unsigned ht)
 {
-	storage(pixelformat_from_image(img, use_srgb_format), img.get_width(), img.get_height(), lv);
-	image(0, img.get_pixels());
+	return AsyncTransfer(*this, level, x, y, wd, ht);
 }
 
-unsigned Texture2D::get_n_levels() const
+void Texture2D::image(const Graphics::Image &img, unsigned lv)
 {
-	unsigned n = 0;
-	for(unsigned s=max(width, height); s; s>>=1, ++n) ;
-	return n;
+	storage(pixelformat_from_image(img, use_srgb_format), img.get_width(), img.get_height(), lv);
+	image(0, img.get_pixels());
 }
 
 LinAl::Vector<unsigned, 2> Texture2D::get_level_size(unsigned level) const
@@ -79,16 +72,6 @@ LinAl::Vector<unsigned, 2> Texture2D::get_level_size(unsigned level) const
 	return LinAl::Vector<unsigned, 2>(w, h);
 }
 
-Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *)
-{
-	return create_async_loader(io);
-}
-
-uint64_t Texture2D::get_data_size() const
-{
-	return id ? width*height*get_pixel_size(format) : 0;
-}
-
 
 Texture2D::Loader::Loader(Texture2D &t):
 	DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t)
@@ -104,18 +87,10 @@ Texture2D::Loader::Loader(Texture2D &t, Collection &c):
 
 void Texture2D::Loader::init()
 {
-	add("raw_data", &Loader::raw_data);
 	add("storage", &Loader::storage);
 	add("storage", &Loader::storage_levels);
 }
 
-void Texture2D::Loader::raw_data(const string &data)
-{
-	if(obj.manager)
-		obj.set_manager(0);
-	obj.image(0, data.data());
-}
-
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
 {
 	obj.storage(fmt, w, h);
@@ -126,5 +101,60 @@ void Texture2D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h,
 	obj.storage(fmt, w, h, l);
 }
 
+
+Texture2D::AsyncTransfer::AsyncTransfer(Texture2D &t, unsigned l, unsigned x_, unsigned y_, unsigned wd, unsigned ht):
+	texture(&t),
+	level(l),
+	x(x_),
+	y(y_),
+	width(wd),
+	height(ht),
+	data_size(width*height*get_pixel_size(texture->storage_fmt)),
+	dest_addr(0)
+{
+	dest_addr = allocate();
+}
+
+Texture2D::AsyncTransfer::AsyncTransfer(AsyncTransfer &&other):
+	Texture2DBackend::AsyncTransfer(move(other)),
+	texture(other.texture),
+	level(other.level),
+	x(other.x),
+	y(other.y),
+	width(other.width),
+	height(other.height),
+	data_size(other.data_size),
+	dest_addr(other.dest_addr)
+{
+	other.dest_addr = 0;
+}
+
+Texture2D::AsyncTransfer &Texture2D::AsyncTransfer::operator=(AsyncTransfer &&other)
+{
+	if(dest_addr)
+		finalize();
+
+	Texture2DBackend::AsyncTransfer::operator=(move(other));
+
+	texture = other.texture;
+	level = other.level;
+	x = other.x;
+	y = other.y;
+	width = other.width;
+	height = other.height;
+	data_size = other.data_size;
+	dest_addr = other.dest_addr;
+
+	other.dest_addr = 0;
+
+	return *this;
+}
+
+Texture2D::AsyncTransfer::~AsyncTransfer()
+{
+	if(dest_addr)
+		finalize();
+}
+
 } // namespace GL
 } // namespace Msp