X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexture2d.cpp;h=7cad81d92a5e44e2717bbaf88f1c35d166fa8dc3;hb=89d3d10b75a42f86b224feb00b20283af66c0b01;hp=f36cadae09aaa21f6abd7f97729d16bf34f6d714;hpb=9d696772b2194b67d8e3e4da11169900eab58c0d;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index f36cadae..7cad81d9 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -32,6 +32,7 @@ public:
 
 Texture2D::Texture2D(ResourceManager *m):
 	Texture(GL_TEXTURE_2D, m),
+	ifmt(RGB),
 	width(0),
 	height(0),
 	allocated(0)
@@ -73,6 +74,7 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
+		auto_generate_mipmap();
 		for(; (w || h); w>>=1, h>>=1, ++level) ;
 		allocated |= (1<<level)-1;
 	}
@@ -139,10 +141,17 @@ Resource::AsyncLoader *Texture2D::load(IO::Seekable &io)
 	return new AsyncLoader(*this, io);
 }
 
+UInt64 Texture2D::get_data_size() const
+{
+	return id ? width*height*get_component_count(ifmt) : 0;
+}
+
 void Texture2D::unload()
 {
 	glDeleteTextures(1, &id);
 	id = 0;
+	// TODO check which params actually need refreshing
+	dirty_params = -1;
 }
 
 
@@ -199,10 +208,7 @@ Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
 	pixel_buffer(PIXEL_UNPACK_BUFFER),
 	mapped_address(0),
 	phase(0)
-{
-	if(!texture.id)
-		glGenTextures(1, &texture.id);
-}
+{ }
 
 bool Texture2D::AsyncLoader::needs_sync() const
 {
@@ -237,6 +243,8 @@ bool Texture2D::AsyncLoader::process()
 			return false;
 		}
 
+		if(!texture.id)
+			glGenTextures(1, &texture.id);
 		texture.image(image, false, true);
 	}