X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=311a3e4569704c92b99703c4a0473f508778c9e1;hb=71ca61440610e650c6c1b761ebee1b587bbc969e;hp=be4e1a112d08e8c02f189fbcd951dce4dfcdcf2c;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index be4e1a11..311a3e45 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,5 +1,11 @@
+#include <msp/core/raii.h>
+#include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include "bindable.h"
+#include "buffer.h"
 #include "error.h"
+#include "pixelstore.h"
+#include "resources.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -7,34 +13,76 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Texture2D::Texture2D():
-	Texture(GL_TEXTURE_2D),
+class Texture2D::AsyncLoader: public Resource::AsyncLoader
+{
+private:
+	Texture2D &texture;
+	IO::Seekable &io;
+	Buffer pixel_buffer;
+	char *mapped_address;
+	Graphics::Image image;
+	unsigned n_bytes;
+	int phase;
+
+public:
+	AsyncLoader(Texture2D &, IO::Seekable &);
+
+	virtual bool needs_sync() const;
+	virtual bool process();
+};
+
+
+Texture2D::Texture2D(ResourceManager *m):
+	Texture(GL_TEXTURE_2D, m),
 	width(0),
 	height(0),
 	allocated(0)
 { }
 
-void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
+Texture2D::~Texture2D()
+{
+	set_manager(0);
+}
+
+void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
 {
 	if(width>0)
 		throw invalid_operation("Texture2D::storage");
 	if(wd==0 || ht==0)
 		throw invalid_argument("Texture2D::storage");
 
-	ifmt = fmt;
+	set_format(fmt);
 	width = wd;
 	height = ht;
+	levels = get_n_levels();
+	if(lv>0)
+		levels = min(levels, lv);
 }
 
 void Texture2D::allocate(unsigned level)
 {
+	if(width==0 || height==0)
+		throw invalid_operation("Texture2D::allocate");
+	if(level>=levels)
+		throw invalid_argument("Texture2D::allocate");
 	if(allocated&(1<<level))
 		return;
 
-	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+	if(ARB_texture_storage)
+	{
+		Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
+		if(ARB_direct_state_access)
+			glTextureStorage2D(id, levels, storage_fmt, width, height);
+		else
+			glTexStorage2D(target, levels, storage_fmt, width, height);
+		apply_swizzle();
+		allocated |= (1<<levels)-1;
+	}
+	else
+		image(level, 0);
 }
 
-void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
+void Texture2D::image(unsigned level, const void *data)
 {
 	if(width==0 || height==0)
 		throw invalid_operation("Texture2D::image");
@@ -43,50 +91,91 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	unsigned h = height;
 	get_level_size(level, w, h);
 
-	Bind _bind(this, true);
-	glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
+	if(ARB_texture_storage)
+		return sub_image(level, 0, 0, w, h, data);
+
+	BindRestore _bind(this);
+
+	if(!allocated)
+	{
+		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+		apply_swizzle();
+	}
+
+	PixelComponents comp = get_components(storage_fmt);
+	DataType type = get_component_type(storage_fmt);
+	glTexImage2D(target, level, storage_fmt, w, h, 0, comp, type, data);
 
 	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(auto_gen_mipmap && level==0)
 	{
-		for(; (w || h); w>>=1, h>>=1, ++level) ;
-		allocated |= (1<<level)-1;
+		generate_mipmap();
+		allocated |= (1<<levels)-1;
 	}
 }
 
-void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
+void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+{
+	if(comp!=get_components(format) || type!=get_component_type(format))
+		throw incompatible_data("Texture2D::image");
+	image(level, data);
+}
+
+void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
 {
 	if(width==0 || height==0)
 		throw invalid_operation("Texture2D::sub_image");
 
+	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	allocate(level);
 
-	Bind _bind(this, true);
-	glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
+	PixelComponents comp = get_components(storage_fmt);
+	DataType type = get_component_type(storage_fmt);
+	if(ARB_direct_state_access)
+		glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);
+	else
+		glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
+
+	if(auto_gen_mipmap && level==0)
+		generate_mipmap();
 }
 
-void Texture2D::load_image(const string &fn)
+void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
 {
-	Graphics::Image img;
-	img.load_file(fn);
+	if(comp!=get_components(format) || type!=get_component_type(format))
+		throw incompatible_data("Texture2D::sub_image");
+	sub_image(level, x, y, wd, ht, data);
+}
 
-	image(img);
+void Texture2D::image(const Graphics::Image &img, unsigned lv)
+{
+	image(img, lv, false);
 }
 
-void Texture2D::image(const Graphics::Image &img)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool from_buffer)
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
-	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+	PixelFormat fmt = pixelformat_from_image(img);
 	if(width==0)
-		storage(fmt, w, h);
-	else if(w!=width || h!=height)
+		storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv);
+	else if(w!=width || h!=height || (lv && lv!=levels))
 		throw incompatible_data("Texture2D::image");
 
-	image(0, fmt, UNSIGNED_BYTE, img.get_data());
+	PixelStore pstore = PixelStore::from_image(img);
+	BindRestore _bind_ps(pstore);
+
+	image(0, from_buffer ? 0 : img.get_pixels());
 }
 
-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;
@@ -97,38 +186,114 @@ void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
 		h = 1;
 }
 
+Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *)
+{
+	AsyncLoader *ldr = new AsyncLoader(*this, io);
+	return ldr;
+}
+
+UInt64 Texture2D::get_data_size() const
+{
+	return id ? width*height*get_pixel_size(format) : 0;
+}
+
+void Texture2D::unload()
+{
+	glDeleteTextures(1, &id);
+	id = 0;
+	allocated = 0;
+	default_sampler.unload();
+}
+
 
 Texture2D::Loader::Loader(Texture2D &t):
-	Texture::Loader(t)
+	DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t)
 {
-	add("image_data", &Loader::image_data);
-	add("raw_data", &Loader::raw_data);
-	add("storage", &Loader::storage);
-	add("storage", &Loader::storage_b);
+	init();
 }
 
-void Texture2D::Loader::image_data(const string &data)
+Texture2D::Loader::Loader(Texture2D &t, Collection &c):
+	DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t, c)
 {
-	Graphics::Image img;
-	img.load_memory(data.data(), data.size());
+	init();
+}
 
-	static_cast<Texture2D &>(obj).image(img);
+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)
 {
-	Texture2D &t2d = static_cast<Texture2D &>(obj);
-	t2d.image(0, t2d.ifmt, UNSIGNED_BYTE, data.data());
+	obj.image(0, data.data());
 }
 
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
 {
-	static_cast<Texture2D &>(obj).storage(fmt, w, h);
+	obj.storage(fmt, w, h);
+}
+
+void Texture2D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, unsigned l)
+{
+	obj.storage(fmt, w, h, l);
+}
+
+
+Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
+	texture(t),
+	io(i),
+	pixel_buffer(PIXEL_UNPACK_BUFFER),
+	mapped_address(0),
+	phase(0)
+{ }
+
+bool Texture2D::AsyncLoader::needs_sync() const
+{
+	return phase%2;
 }
 
-void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)
+bool Texture2D::AsyncLoader::process()
 {
-	storage(fmt, w, h);
+	if(phase==0)
+	{
+		/* TODO Enhance the ImageLoader system so that the image can be loaded
+		directly to the buffer */
+		image.load_io(io);
+		n_bytes = image.get_stride()*image.get_height();
+	}
+	else if(phase==1)
+	{
+		pixel_buffer.storage(n_bytes);
+		mapped_address = reinterpret_cast<char *>(pixel_buffer.map());
+	}
+	else if(phase==2)
+	{
+		const char *data = reinterpret_cast<const char *>(image.get_pixels());
+		copy(data, data+n_bytes, mapped_address);
+	}
+	else if(phase==3)
+	{
+		Bind _bind_buf(pixel_buffer, PIXEL_UNPACK_BUFFER);
+		if(!pixel_buffer.unmap())
+		{
+			phase = 1;
+			return false;
+		}
+
+		if(!texture.id)
+		{
+			if(ARB_direct_state_access)
+				glCreateTextures(texture.target, 1, &texture.id);
+			else
+				glGenTextures(1, &texture.id);
+		}
+		texture.image(image, 0, true);
+	}
+
+	++phase;
+	return phase>3;
 }
 
 } // namespace GL