X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.cpp;h=528c4a58d216416ad2ca9816852bd0a7001d2a9e;hb=a92362ad19b65f66b98e0dc4d034da5e4eb5cf36;hp=0f06790c06056f419f6f50766db8a4eb975793f3;hpb=2e7f0e8b226fdeea3306e2e0eef22a8f200ae16b;p=libs%2Fgl.git

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index 0f06790c..528c4a58 100644
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -5,7 +5,6 @@
 #include "bindable.h"
 #include "buffer.h"
 #include "error.h"
-#include "pixelstore.h"
 #include "resources.h"
 #include "texture2d.h"
 
@@ -50,7 +49,11 @@ Texture2D::~Texture2D()
 void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
 {
 	if(width>0)
-		throw invalid_operation("Texture2D::storage");
+	{
+		if(fmt!=format || wd!=width || ht!=height || (lv && lv!=levels))
+			throw incompatible_data("Texture2D::storage");
+		return;
+	}
 	if(wd==0 || ht==0)
 		throw invalid_argument("Texture2D::storage");
 
@@ -68,12 +71,27 @@ void Texture2D::allocate(unsigned level)
 		throw invalid_operation("Texture2D::allocate");
 	if(level>=levels)
 		throw invalid_argument("Texture2D::allocate");
+
+	bool direct = ARB_texture_storage && ARB_direct_state_access;
+	if(!direct)
+	{
+		glActiveTexture(GL_TEXTURE0);
+		glBindTexture(target, id);
+	}
+
+	allocate_(level);
+
+	if(!direct)
+		glBindTexture(target, 0);
+}
+
+void Texture2D::allocate_(unsigned level)
+{
 	if(allocated&(1<<level))
 		return;
 
 	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
@@ -82,39 +100,50 @@ void Texture2D::allocate(unsigned level)
 		allocated |= (1<<levels)-1;
 	}
 	else
-		image(level, 0);
+		image_(level, 0);
 }
 
 void Texture2D::image(unsigned level, const void *data)
 {
 	if(width==0 || height==0)
 		throw invalid_operation("Texture2D::image");
-
-	unsigned w = width;
-	unsigned h = height;
-	get_level_size(level, w, h);
+	if(level>=levels)
+		throw out_of_range("Texture2D::image");
 
 	if(ARB_texture_storage)
-		return sub_image(level, 0, 0, w, h, data);
+	{
+		LinAl::Vector<unsigned, 2> size = get_level_size(level);
+		return sub_image(level, 0, 0, size.x, size.y, data);
+	}
+
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(target, id);
+
+	image_(level, data);
+
+	if(auto_gen_mipmap && level==0)
+	{
+		generate_mipmap_();
+		allocated |= (1<<levels)-1;
+	}
 
-	BindRestore _bind(this);
+	glBindTexture(target, 0);
+}
 
+void Texture2D::image_(unsigned level, const void *data)
+{
 	if(!allocated)
 	{
 		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
 		apply_swizzle();
 	}
 
+	LinAl::Vector<unsigned, 2> size = get_level_size(level);
 	PixelComponents comp = get_components(storage_fmt);
 	GLenum type = get_gl_type(get_component_type(storage_fmt));
-	glTexImage2D(target, level, storage_fmt, w, h, 0, comp, type, data);
+	glTexImage2D(target, level, storage_fmt, size.x, size.y, 0, comp, type, data);
 
 	allocated |= 1<<level;
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap();
-		allocated |= (1<<levels)-1;
-	}
 }
 
 void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
@@ -128,9 +157,17 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 {
 	if(width==0 || height==0)
 		throw invalid_operation("Texture2D::sub_image");
+	if(level>=levels)
+		throw out_of_range("Texture2D::sub_image");
 
-	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
-	allocate(level);
+	bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
+	if(!direct)
+	{
+		glActiveTexture(GL_TEXTURE0);
+		glBindTexture(target, id);
+	}
+
+	allocate_(level);
 
 	PixelComponents comp = get_components(storage_fmt);
 	GLenum type = get_gl_type(get_component_type(storage_fmt));
@@ -140,7 +177,10 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 		glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
 
 	if(auto_gen_mipmap && level==0)
-		generate_mipmap();
+		generate_mipmap_();
+
+	if(!direct)
+		glBindTexture(target, 0);
 }
 
 void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
@@ -160,13 +200,7 @@ 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_image(img);
-	if(width==0)
-		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");
-
-	PixelStore pstore = PixelStore::from_image(img);
-	BindRestore _bind_ps(pstore);
+	storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv);
 
 	image(0, from_buffer ? 0 : img.get_pixels());
 }
@@ -178,15 +212,17 @@ unsigned Texture2D::get_n_levels() const
 	return n;
 }
 
-void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) const
+LinAl::Vector<unsigned, 2> Texture2D::get_level_size(unsigned level) const
 {
-	w >>= level;
-	h >>= level;
+	unsigned w = width>>level;
+	unsigned h = height>>level;
 
 	if(!w && h)
 		w = 1;
 	else if(!h && w)
 		h = 1;
+
+	return LinAl::Vector<unsigned, 2>(w, h);
 }
 
 Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *)
@@ -205,7 +241,6 @@ void Texture2D::unload()
 	glDeleteTextures(1, &id);
 	id = 0;
 	allocated = 0;
-	default_sampler.unload();
 }
 
 
@@ -230,6 +265,12 @@ void Texture2D::Loader::init()
 
 void Texture2D::Loader::raw_data(const string &data)
 {
+	if(obj.manager)
+	{
+		obj.set_manager(0);
+		if(!obj.id)
+			obj.generate_id();
+	}
 	obj.image(0, data.data());
 }
 
@@ -247,7 +288,6 @@ void Texture2D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h,
 Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
 	texture(t),
 	io(i),
-	pixel_buffer(PIXEL_UNPACK_BUFFER),
 	mapped_address(0),
 	img_loader(Graphics::ImageLoader::open_io(io)),
 	phase(0)
@@ -281,7 +321,6 @@ bool Texture2D::AsyncLoader::process()
 		image.load_into(*img_loader, mapped_address);
 	else if(phase==3)
 	{
-		Bind _bind_buf(pixel_buffer, PIXEL_UNPACK_BUFFER);
 		mapped_address = 0;
 		if(!pixel_buffer.unmap())
 		{
@@ -291,7 +330,9 @@ bool Texture2D::AsyncLoader::process()
 
 		if(!texture.id)
 			texture.generate_id();
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pixel_buffer.get_id());
 		texture.image(image, 0, true);
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
 	}
 
 	++phase;