X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=08383526728bb7a239b8551c910c75c6a2ff2f03;hb=a9bf08d7c8d54204b76f91dab95052b737595bea;hp=7ce18d00a9fa075b5df6b2a5ea1dac741411165f;hpb=1955e583d7eeeb0a2ff054d90c3694f575d9a08d;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 7ce18d00..08383526 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -46,7 +46,7 @@ Texture2D::~Texture2D()
 	set_manager(0);
 }
 
-void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
+void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
 {
 	if(width>0)
 		throw invalid_operation("Texture2D::storage");
@@ -56,24 +56,30 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 	set_internal_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;
 
 	if(ARB_texture_storage)
 	{
-		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
 		if(ARB_direct_state_access)
-			glTextureStorage2D(id, n_levels, ifmt, width, height);
+			glTextureStorage2D(id, levels, ifmt, width, height);
 		else
 		{
 			BindRestore _bind(this);
-			glTexStorage2D(target, n_levels, ifmt, width, height);
+			glTexStorage2D(target, levels, ifmt, width, height);
 		}
-		allocated |= (1<<n_levels)-1;
+		allocated |= (1<<levels)-1;
 	}
 	else
 	{
@@ -98,9 +104,9 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(auto_gen_mipmap && level==0)
 	{
-		auto_generate_mipmap();
+		generate_mipmap();
 		allocated |= (1<<get_n_levels())-1;
 	}
 }
@@ -119,8 +125,8 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 	else
 		glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
 
-	if(gen_mipmap && level==0)
-		auto_generate_mipmap();
+	if(auto_gen_mipmap && level==0)
+		generate_mipmap();
 }
 
 void Texture2D::image(const Graphics::Image &img, bool srgb)
@@ -134,7 +140,10 @@ 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)
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h);
+	{
+		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)
 		throw incompatible_data("Texture2D::image");
 
@@ -209,8 +218,6 @@ void Texture2D::Loader::raw_data(const string &data)
 
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
 {
-	if(srgb)
-		fmt = get_srgb_pixelformat(fmt);
 	obj.storage(fmt, w, h);
 }
 
@@ -245,8 +252,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)
 	{
@@ -263,7 +270,12 @@ bool Texture2D::AsyncLoader::process()
 		}
 
 		if(!texture.id)
-			glGenTextures(1, &texture.id);
+		{
+			if(ARB_direct_state_access)
+				glCreateTextures(texture.target, 1, &texture.id);
+			else
+				glGenTextures(1, &texture.id);
+		}
 		texture.image(image, srgb_conversion, true);
 	}