X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture3d.cpp;h=984ffac7d4ef1a07985b3bf033915bbac3cf5b57;hb=6065f6622cc275dc0b20baaf7c267e71169d18f3;hp=705a40ba5574cc950078d119e9061a90e6bd9272;hpb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784;p=libs%2Fgl.git

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index 705a40ba..984ffac7 100644
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -1,5 +1,4 @@
 #include <cmath>
-#include <msp/core/raii.h>
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/ext_texture3d.h>
@@ -103,18 +102,6 @@ void Texture3D::image(unsigned level, const void *data)
 	glTexImage3D(target, level, fmt, size.x, size.y, size.z, 0, comp, type, data);
 
 	allocated |= 1<<level;
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap();
-		allocated |= (1<<levels)-1;
-	}
-}
-
-void Texture3D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
-{
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("Texture3D::image");
-	image(level, data);
 }
 
 void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
@@ -135,16 +122,6 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 		bind_scratch();
 		glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data);
 	}
-
-	if(auto_gen_mipmap && level==0)
-		generate_mipmap();
-}
-
-void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelComponents comp, DataType type, const void *data)
-{
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("Texture3D::sub_image");
-	sub_image(level, x, y, z, wd, ht, dp, data);
 }
 
 void Texture3D::image(const Graphics::Image &img, unsigned lv)
@@ -191,7 +168,7 @@ LinAl::Vector<unsigned, 3> Texture3D::get_level_size(unsigned level) const
 	return LinAl::Vector<unsigned, 3>(w, h, d);
 }
 
-UInt64 Texture3D::get_data_size() const
+uint64_t Texture3D::get_data_size() const
 {
 	return id ? width*height*depth*get_pixel_size(storage_fmt) : 0;
 }