X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture3d.h;h=4a166174fbf75fb30bb8800ca3a3017c1ef5b43f;hp=df52bf66ee8daeb1e1a879440c63ed52ab799833;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=2b7f8e45e75bec30c1ea27fc0efd8286f67adc3f

diff --git a/source/core/texture3d.h b/source/core/texture3d.h
index df52bf66..4a166174 100644
--- a/source/core/texture3d.h
+++ b/source/core/texture3d.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <msp/linal/vector.h>
-#include "texture.h"
+#include "texture3d_backend.h"
 
 namespace Msp {
 namespace GL {
@@ -12,8 +12,10 @@ namespace GL {
 Three-dimensional texture.  Consists of an array of texels in the shape of a
 right cuboid.  Texture coordinates have a principal range of [0, 1].
 */
-class Texture3D: public Texture
+class Texture3D: public Texture3DBackend
 {
+	friend Texture3DBackend;
+
 public:
 	class Loader: public Msp::DataFile::DerivedObjectLoader<Texture3D, Texture::Loader>
 	{
@@ -29,15 +31,14 @@ public:
 	};
 
 protected:
-	unsigned width;
-	unsigned height;
-	unsigned depth;
-	unsigned levels;
-	unsigned allocated;
+	unsigned width = 0;
+	unsigned height = 0;
+	unsigned depth = 0;
+	unsigned levels = 0;
 
-	Texture3D(GLenum);
+	Texture3D(unsigned);
 public:
-	Texture3D();
+	Texture3D() = default;
 
 	/** Defines storage structure for the texture.  If lv is zero, the number
 	of mipmap levels is automatically determined from storage dimensions.
@@ -46,29 +47,16 @@ public:
 	it can't be changed. */
 	void storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv = 0);
 
-	DEPRECATED void storage(PixelComponents c, unsigned w, unsigned h, unsigned d, unsigned l = 0)
-	{ storage(make_pixelformat(c, UNSIGNED_BYTE), w, h, d, l); }
-
-	/** Allocates storage for the texture.  The contents are initially
-	undefined.  If storage has already been allocated, does nothing. */
-	void allocate(unsigned level);
-
 	/** Updates the contents of the entire texture.  Storage must be defined
 	beforehand.  The image data must have dimensions and format matching the
 	defined storage. */
 	void image(unsigned level, const void *data);
 
-	DEPRECATED void image(unsigned level, PixelComponents comp, DataType type, const void *data);
-
 	/** Updates a cuboid-shaped region of the texture.  Storage must be defined
 	beforehand.  The image data must be in a format mathing the defined storage
 	and the update 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 *data);
 
-	DEPRECATED void sub_image(unsigned level,
-		int x, int y, int z, unsigned wd, unsigned ht, unsigned dp,
-		PixelComponents comp, DataType type, const void *data);
-
 	/** Updates the contents of the entire texture from an image.  If storage
 	has not been defined, it will be set to match the image.  In this case the
 	image will be treated as a stack of square layers and its height must be
@@ -87,7 +75,7 @@ protected:
 
 public:
 	virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
-	virtual UInt64 get_data_size() const;
+	virtual std::uint64_t get_data_size() const;
 	virtual void unload() { }
 };