X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=64ad124f97a1952f19307d429c8f9acd427d76c1;hb=9885c5465db78b6a1d9cc8bf7ffa7a79fb116afc;hp=e237e504176ace2bfd56ddf74597907aee397abb;hpb=4d7f66ea28c788e12f700216b9c53af9e71b8390;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index e237e504..64ad124f 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -16,6 +16,7 @@ class Texture2D::AsyncLoader: public Resource::AsyncLoader
 private:
 	Texture2D &texture;
 	IO::Seekable &io;
+	bool srgb_conversion;
 	Buffer pixel_buffer;
 	char *mapped_address;
 	Graphics::Image image;
@@ -25,6 +26,7 @@ private:
 public:
 	AsyncLoader(Texture2D &, IO::Seekable &);
 
+	void set_srgb_conversion(bool);
 	virtual bool needs_sync() const;
 	virtual bool process();
 };
@@ -38,6 +40,11 @@ Texture2D::Texture2D(ResourceManager *m):
 	allocated(0)
 { }
 
+Texture2D::~Texture2D()
+{
+	set_manager(0);
+}
+
 void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 {
 	if(width>0)
@@ -56,7 +63,8 @@ void Texture2D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+	PixelFormat base_fmt = get_base_pixelformat(ifmt);
+	image(level, base_fmt, get_alloc_type(base_fmt), 0);
 }
 
 void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -74,6 +82,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;
 	}
@@ -135,9 +144,12 @@ void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
 		h = 1;
 }
 
-Resource::AsyncLoader *Texture2D::load(IO::Seekable &io)
+Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *res)
 {
-	return new AsyncLoader(*this, io);
+	AsyncLoader *ldr = new AsyncLoader(*this, io);
+	if(res)
+		ldr->set_srgb_conversion(res->get_srgb_conversion());
+	return ldr;
 }
 
 UInt64 Texture2D::get_data_size() const
@@ -204,12 +216,15 @@ void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsig
 Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
 	texture(t),
 	io(i),
+	srgb_conversion(false),
 	pixel_buffer(PIXEL_UNPACK_BUFFER),
 	mapped_address(0),
 	phase(0)
+{ }
+
+void Texture2D::AsyncLoader::set_srgb_conversion(bool c)
 {
-	if(!texture.id)
-		glGenTextures(1, &texture.id);
+	srgb_conversion = c;
 }
 
 bool Texture2D::AsyncLoader::needs_sync() const
@@ -245,7 +260,9 @@ bool Texture2D::AsyncLoader::process()
 			return false;
 		}
 
-		texture.image(image, false, true);
+		if(!texture.id)
+			glGenTextures(1, &texture.id);
+		texture.image(image, srgb_conversion, true);
 	}
 
 	++phase;