X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture3d.h;h=3009e1487a6d57b48ecfb03dd47665db532287e1;hp=9d5104c91e42892de2d9189b31291f4352c98e2f;hb=8e58fc4da8443cb67fe4cd70d6f68de2be73011d;hpb=190a7e11237351f6b730c28f7b16f183e8adc69c

diff --git a/source/core/texture3d.h b/source/core/texture3d.h
index 9d5104c9..3009e148 100644
--- a/source/core/texture3d.h
+++ b/source/core/texture3d.h
@@ -24,7 +24,6 @@ public:
 	private:
 		void init();
 
-		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned, unsigned, unsigned);
 		void storage_levels(PixelFormat, unsigned, unsigned, unsigned, unsigned);
 	};
@@ -52,7 +51,7 @@ public:
 	/** Replaces a cuboid-shaped region of the texture.  Allocated storage must
 	exist.  The image data is interpreted according to the storage format and
 	the region must be fully inside the texture. */
-	void sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *);
+	void sub_image(unsigned level, unsigned x, unsigned y, unsigned z, unsigned wd, unsigned ht, unsigned dp, const void *);
 
 	/** Sets the texture's contents from an image.  The image is treated as a
 	stack of square layers and its height must be divisible by its width.  If
@@ -66,11 +65,6 @@ public:
 protected:
 	unsigned get_n_levels() const;
 	LinAl::Vector<unsigned, 3> get_level_size(unsigned) const;
-
-public:
-	virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
-	virtual std::size_t get_data_size() const;
-	virtual void unload() { }
 };
 
 } // namespace GL