X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture1d.cpp;h=e746409b8101dfca984017761e5a46998927edf8;hp=c5e57df22843d0e0dc84675c24d08bebcaaf1c74;hb=ef9ffbc287417520d223ce29dc6c2de110cac945;hpb=3c46227c280bc4cd8a4487c648f2f080d5b4f7ea

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index c5e57df2..e746409b 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -19,7 +19,7 @@ Texture1D::Texture1D():
 	static Require _req(MSP_texture1D);
 }
 
-void Texture1D::storage(PixelFormat fmt, unsigned wd)
+void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
 {
 	if(width>0)
 		throw invalid_operation("Texture1D::storage");
@@ -28,26 +28,30 @@ void Texture1D::storage(PixelFormat fmt, unsigned wd)
 
 	set_internal_format(fmt);
 	width = wd;
+	levels = get_n_levels();
+	if(lv)
+		levels = min(levels, lv);
 }
 
 void Texture1D::allocate(unsigned level)
 {
 	if(width==0)
 		throw invalid_operation("Texture1D::allocate");
+	if(level>=levels)
+		throw invalid_argument("Texture1D::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)
-			glTextureStorage1D(id, n_levels, ifmt, width);
+			glTextureStorage1D(id, levels, ifmt, width);
 		else
 		{
 			BindRestore _bind(this);
-			glTexStorage1D(target, n_levels, ifmt, width);
+			glTexStorage1D(target, levels, ifmt, width);
 		}
-		allocated |= (1<<n_levels)-1;
+		allocated |= (1<<levels)-1;
 	}
 	else
 	{
@@ -103,7 +107,10 @@ void Texture1D::image(const Graphics::Image &img, bool srgb)
 	unsigned w = img.get_width();
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+	{
+		unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, l);
+	}
 	else if(w!=width)
 		throw incompatible_data("Texture1D::image");
 
@@ -153,8 +160,6 @@ void Texture1D::Loader::raw_data(const string &data)
 
 void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
 {
-	if(srgb)
-		fmt = get_srgb_pixelformat(fmt);
 	obj.storage(fmt, w);
 }