X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=4d3dac037291137856d28a77926e9517ac9475de;hb=49323eea600fb989d4181ccfd437ee12722ae733;hp=2ea713eb3a539c9705e13f90b2775ff9b643fdfd;hpb=946266e823c07025f115b5e4f5523b496dcb393e;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 2ea713eb..4d3dac03 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,4 +1,3 @@
-#include <msp/io/memory.h>
 #include "bindable.h"
 #include "buffer.h"
 #include "error.h"
@@ -16,6 +15,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 +25,7 @@ private:
 public:
 	AsyncLoader(Texture2D &, IO::Seekable &);
 
+	void set_srgb_conversion(bool);
 	virtual bool needs_sync() const;
 	virtual bool process();
 };
@@ -38,12 +39,20 @@ Texture2D::Texture2D(ResourceManager *m):
 	allocated(0)
 { }
 
+Texture2D::~Texture2D()
+{
+	set_manager(0);
+}
+
 void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 {
 	if(width>0)
 		throw invalid_operation("Texture2D::storage");
 	if(wd==0 || ht==0)
 		throw invalid_argument("Texture2D::storage");
+
+	if(MSP_sized_internal_formats)
+		fmt = get_sized_pixelformat(fmt);
 	require_pixelformat(fmt);
 
 	ifmt = fmt;
@@ -56,7 +65,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 +84,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;
 	}
@@ -90,14 +101,6 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 	glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
 }
 
-void Texture2D::load_image(const string &fn, bool srgb)
-{
-	Graphics::Image img;
-	img.load_file(fn);
-
-	image(img, srgb);
-}
-
 void Texture2D::image(const Graphics::Image &img, bool srgb)
 {
 	image(img, srgb, false);
@@ -109,12 +112,7 @@ void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
 	unsigned h = img.get_height();
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-	{
-		PixelFormat f = storage_pixelformat_from_graphics(img.get_format());
-		if(srgb)
-			f = get_srgb_pixelformat(f);
-		storage(f, w, h);
-	}
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h);
 	else if(w!=width || h!=height)
 		throw incompatible_data("Texture2D::image");
 
@@ -135,9 +133,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
@@ -168,19 +169,8 @@ Texture2D::Loader::Loader(Texture2D &t, Collection &c):
 
 void Texture2D::Loader::init()
 {
-	add("image_data", &Loader::image_data);
 	add("raw_data", &Loader::raw_data);
 	add("storage", &Loader::storage);
-	add("storage", &Loader::storage_b);
-}
-
-void Texture2D::Loader::image_data(const string &data)
-{
-	Graphics::Image img;
-	IO::Memory mem(data.data(), data.size());
-	img.load_io(mem);
-
-	obj.image(img, srgb);
 }
 
 void Texture2D::Loader::raw_data(const string &data)
@@ -195,20 +185,21 @@ void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
 	obj.storage(fmt, w, h);
 }
 
-void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)
-{
-	storage(fmt, w, h);
-}
-
 
 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)
+{
+	srgb_conversion = c;
+}
+
 bool Texture2D::AsyncLoader::needs_sync() const
 {
 	return phase%2;
@@ -244,7 +235,7 @@ bool Texture2D::AsyncLoader::process()
 
 		if(!texture.id)
 			glGenTextures(1, &texture.id);
-		texture.image(image, false, true);
+		texture.image(image, srgb_conversion, true);
 	}
 
 	++phase;