X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.cpp;h=df8dd06c75c705e06b31547b0501ea4a86e1c1fb;hp=1dbe36eb293e6b02d6a01608b23fb546938eb71a;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784

diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index 1dbe36eb..df8dd06c 100644
--- a/source/core/texture1d.cpp
+++ b/source/core/texture1d.cpp
@@ -86,11 +86,6 @@ void Texture1D::image(unsigned level, const void *data)
 	glTexImage1D(target, level, fmt, get_level_size(level), 0, comp, type, data);
 
 	allocated |= 1<<level;
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap();
-		allocated |= (1<<levels)-1;
-	}
 }
 
 void Texture1D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
@@ -118,9 +113,6 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
 		bind_scratch();
 		glTexSubImage1D(target, level, x, wd, comp, type, data);
 	}
-
-	if(auto_gen_mipmap && level==0)
-		generate_mipmap();
 }
 
 void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelComponents comp, DataType type, const void *data)
@@ -154,7 +146,7 @@ unsigned Texture1D::get_level_size(unsigned level) const
 	return width>>level;
 }
 
-UInt64 Texture1D::get_data_size() const
+uint64_t Texture1D::get_data_size() const
 {
 	return id ? width*get_pixel_size(storage_fmt) : 0;
 }