X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture1d.cpp;h=d09a9570306e077b771d31dce598757e2fc715fb;hp=d88b88c02e57c763d7c3b7731cbb4a159eb430d4;hb=aead6d04308d7873dc99aa4572ce1590a89ebcbd;hpb=344dd6a52b55d847f3346e94ec266a8864764b9d

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index d88b88c0..d09a9570 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -71,13 +71,16 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
 		return sub_image(level, 0, w, fmt, type, data);
 
 	BindRestore _bind(this);
+
+	if(!allocated)
+		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
 	glTexImage1D(target, level, ifmt, w, 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;
 	}
 }
 
@@ -99,7 +102,7 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, D
 		generate_mipmap();
 }
 
-void Texture1D::image(const Graphics::Image &img, bool srgb)
+void Texture1D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
 	if(img.get_height()!=1)
 		throw incompatible_data("Texture1D::image");
@@ -108,7 +111,7 @@ void Texture1D::image(const Graphics::Image &img, bool srgb)
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
 	{
-		unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
+		unsigned l = (is_mipmapped(min_filter) ? lv : 1);
 		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, l);
 	}
 	else if(w!=width)