X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=4aad82d27ad9eeb71678e1b9b1d23386751c6ece;hb=cb836adcf11f690188df9b7bc59f3fe87b67aaa7;hp=f36cadae09aaa21f6abd7f97729d16bf34f6d714;hpb=9d696772b2194b67d8e3e4da11169900eab58c0d;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index f36cadae..4aad82d2 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,4 +1,4 @@
-#include <msp/io/memory.h>
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include "bindable.h"
 #include "buffer.h"
 #include "error.h"
@@ -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();
 };
@@ -32,17 +34,26 @@ public:
 
 Texture2D::Texture2D(ResourceManager *m):
 	Texture(GL_TEXTURE_2D, m),
+	ifmt(RGB),
 	width(0),
 	height(0),
 	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;
@@ -55,7 +66,18 @@ void Texture2D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+	if(ARB_texture_storage)
+	{
+		BindRestore _bind(this);
+		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+		glTexStorage2D(target, n_levels, ifmt, width, height);
+		allocated |= (1<<n_levels)-1;
+	}
+	else
+	{
+		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)
@@ -68,13 +90,16 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	get_level_size(level, w, h);
 
 	BindRestore _bind(this);
-	glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
+	if(ARB_texture_storage)
+		sub_image(level, 0, 0, w, h, fmt, type, data);
+	else
+		glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
-		for(; (w || h); w>>=1, h>>=1, ++level) ;
-		allocated |= (1<<level)-1;
+		auto_generate_mipmap();
+		allocated |= (1<<get_n_levels())-1;
 	}
 }
 
@@ -89,14 +114,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);
@@ -108,12 +125,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");
 
@@ -123,7 +135,14 @@ void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
 	image(0, fmt, UNSIGNED_BYTE, from_buffer ? 0 : img.get_data());
 }
 
-void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
+unsigned Texture2D::get_n_levels() const
+{
+	unsigned n = 0;
+	for(unsigned s=max(width, height); s; s>>=1, ++n) ;
+	return n;
+}
+
+void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) const
 {
 	w >>= level;
 	h >>= level;
@@ -134,15 +153,25 @@ 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
+{
+	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;
 }
 
 
@@ -160,19 +189,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)
@@ -187,21 +205,19 @@ 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)
 {
-	if(!texture.id)
-		glGenTextures(1, &texture.id);
+	srgb_conversion = c;
 }
 
 bool Texture2D::AsyncLoader::needs_sync() const
@@ -237,7 +253,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;