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

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index 285abeb9..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>
@@ -105,13 +104,6 @@ void Texture3D::image(unsigned level, const void *data)
 	allocated |= 1<<level;
 }
 
-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)
 {
 	if(width==0 || height==0 || depth==0)
@@ -132,13 +124,6 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 	}
 }
 
-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)
 {
 	unsigned w = img.get_width();