X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=72c84428ab6115ec4823a62d0264e0e21e989886;hb=fb5ca4dbba257d3eb7fa15800d9663b774e41e7e;hp=daede1836332ca9c2b72a41edf5634a99a09abb1;hpb=a40fc85277dba5c34402a0e703d038efd30cc57b;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index daede183..72c84428 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -101,13 +101,16 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 		return sub_image(level, 0, 0, w, h, fmt, type, data);
 
 	BindRestore _bind(this);
+
+	if(!allocated)
+		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
 	glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
 	if(auto_gen_mipmap && level==0)
 	{
 		generate_mipmap();
-		allocated |= (1<<get_n_levels())-1;
+		allocated |= (1<<levels)-1;
 	}
 }
 
@@ -129,22 +132,19 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 		generate_mipmap();
 }
 
-void Texture2D::image(const Graphics::Image &img, bool srgb)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
-	image(img, srgb, false);
+	image(img, lv, srgb, false);
 }
 
-void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb, bool from_buffer)
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-	{
-		unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, l);
-	}
-	else if(w!=width || h!=height)
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, lv);
+	else if(w!=width || h!=height || (lv && lv!=levels))
 		throw incompatible_data("Texture2D::image");
 
 	PixelStore pstore = PixelStore::from_image(img);
@@ -188,6 +188,7 @@ void Texture2D::unload()
 {
 	glDeleteTextures(1, &id);
 	id = 0;
+	allocated = 0;
 	// TODO check which params actually need refreshing
 	dirty_params = -1;
 }
@@ -209,6 +210,7 @@ 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)
@@ -221,6 +223,11 @@ void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned 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),
@@ -252,8 +259,8 @@ bool Texture2D::AsyncLoader::process()
 	}
 	else if(phase==1)
 	{
-		pixel_buffer.data(n_bytes, 0);
-		mapped_address = reinterpret_cast<char *>(pixel_buffer.map(WRITE_ONLY));
+		pixel_buffer.storage(n_bytes);
+		mapped_address = reinterpret_cast<char *>(pixel_buffer.map());
 	}
 	else if(phase==2)
 	{
@@ -270,8 +277,13 @@ bool Texture2D::AsyncLoader::process()
 		}
 
 		if(!texture.id)
-			glGenTextures(1, &texture.id);
-		texture.image(image, srgb_conversion, true);
+		{
+			if(ARB_direct_state_access)
+				glCreateTextures(texture.target, 1, &texture.id);
+			else
+				glGenTextures(1, &texture.id);
+		}
+		texture.image(image, 0, srgb_conversion, true);
 	}
 
 	++phase;