X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.h;h=1871a17caaa4d282ae1fee19fb656c3686808029;hb=160e9eea29bd10034733d59507fa1bcca36be401;hp=b14ff917666f88cb02fc7fbbcd5c55a8330b0075;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/core/texture1d.h b/source/core/texture1d.h
index b14ff917..1871a17c 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>
 	{
@@ -25,21 +28,14 @@ public:
 private:
 	unsigned width;
 	unsigned levels;
-	unsigned allocated;
 
 public:
 	Texture1D();
 
 	void storage(PixelFormat, unsigned, unsigned = 0);
 
-	DEPRECATED void storage(PixelComponents c, unsigned w, unsigned l = 0)
-	{ storage(make_pixelformat(c, UNSIGNED_BYTE), w, l); }
-
-	void allocate(unsigned);
 	void image(unsigned, const void *);
-	DEPRECATED void image(unsigned, PixelComponents, DataType, const void *);
 	void sub_image(unsigned, int, unsigned, const void *);
-	DEPRECATED void sub_image(unsigned, int, unsigned, PixelComponents, DataType, const void *);
 	virtual void image(const Graphics::Image &, unsigned = 0);
 	using Texture::image;
 	unsigned get_width() const { return width; }
@@ -50,7 +46,7 @@ private:
 
 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() { }
 };