X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.cpp;h=78f8c9e983034f34eadec903c5c53ffb4ffd6c5d;hb=2b7f8e45e75bec30c1ea27fc0efd8286f67adc3f;hp=6e7d97202f341cc12e2a76d9e94b92f840c3ff94;hpb=412996297a287c9e97a7207458877c0ab07cc8b6;p=libs%2Fgl.git

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index 6e7d9720..78f8c9e9 100644
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -50,7 +50,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");
 
@@ -89,13 +93,13 @@ void Texture2D::image(unsigned level, const void *data)
 {
 	if(width==0 || height==0)
 		throw invalid_operation("Texture2D::image");
+	if(level>=levels)
+		throw out_of_range("Texture2D::image");
 
-	unsigned w = width;
-	unsigned h = height;
-	get_level_size(level, w, h);
+	LinAl::Vector<unsigned, 2> size = get_level_size(level);
 
 	if(ARB_texture_storage)
-		return sub_image(level, 0, 0, w, h, data);
+		return sub_image(level, 0, 0, size.x, size.y, data);
 
 	BindRestore _bind(this);
 
@@ -107,7 +111,7 @@ void Texture2D::image(unsigned level, const void *data)
 
 	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)
@@ -128,6 +132,8 @@ 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);
@@ -160,10 +166,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");
+	storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv);
 
 	PixelStore pstore = PixelStore::from_image(img);
 	BindRestore _bind_ps(pstore);
@@ -178,15 +181,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 +210,6 @@ void Texture2D::unload()
 	glDeleteTextures(1, &id);
 	id = 0;
 	allocated = 0;
-	default_sampler.unload();
 }
 
 
@@ -253,7 +257,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)