X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.h;h=c4230d3162d08e85d2ae046d94250f22c9a3578a;hb=be6ffe96ecb4707599fe1a6f620c348760213d46;hp=d8dbb017bd6882c0a941e770e660b1dd9394be1a;hpb=6065f6622cc275dc0b20baaf7c267e71169d18f3;p=libs%2Fgl.git

diff --git a/source/core/texture1d.h b/source/core/texture1d.h
index d8dbb017..c4230d31 100644
--- a/source/core/texture1d.h
+++ b/source/core/texture1d.h
@@ -1,13 +1,16 @@
 #ifndef MSP_GL_TEXTURE1D_H_
 #define MSP_GL_TEXTURE1D_H_
 
-#include "texture.h"
+#include <string>
+#include "texture1d_backend.h"
 
 namespace Msp {
 namespace GL {
 
-class Texture1D: public Texture
+class Texture1D: public Texture1DBackend
 {
+	friend Texture1DBackend;
+
 public:
 	class Loader: public DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>
 	{
@@ -23,20 +26,16 @@ public:
 	};
 
 private:
-	unsigned width;
-	unsigned levels;
-	unsigned allocated;
+	unsigned width = 0;
+	unsigned levels = 0;
 
 public:
-	Texture1D();
-
 	void storage(PixelFormat, unsigned, unsigned = 0);
 
-	void allocate(unsigned);
 	void image(unsigned, const void *);
 	void sub_image(unsigned, int, unsigned, const void *);
 	virtual void image(const Graphics::Image &, unsigned = 0);
-	using Texture::image;
+
 	unsigned get_width() const { return width; }
 
 private:
@@ -45,7 +44,7 @@ private:
 
 public:
 	virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
-	virtual std::uint64_t get_data_size() const;
+	virtual std::size_t get_data_size() const;
 	virtual void unload() { }
 };