X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.h;h=05c3283b73bd1aba1dd98f348c0c620753611114;hb=c356a20547afae97b412da36e0b0a7d51e879401;hp=427e179563943b312c7ea4f87b7ae3a5595e09db;hpb=190a7e11237351f6b730c28f7b16f183e8adc69c;p=libs%2Fgl.git

diff --git a/source/core/texture2d.h b/source/core/texture2d.h
index 427e1795..05c3283b 100644
--- a/source/core/texture2d.h
+++ b/source/core/texture2d.h
@@ -24,7 +24,6 @@ public:
 	private:
 		void init();
 
-		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned, unsigned);
 		void storage_levels(PixelFormat, unsigned, unsigned, unsigned);
 	};
@@ -32,9 +31,10 @@ public:
 private:
 	unsigned width = 0;
 	unsigned height = 0;
-	unsigned levels = 0;
 
 public:
+	Texture2D() = default;
+	Texture2D(Texture2D &&) = default;
 	virtual ~Texture2D();
 
 	/** Sets storage format and dimensions and allocates memory for the texture.
@@ -42,15 +42,12 @@ public:
 	cannot be changed once set. */
 	void storage(PixelFormat, unsigned wd, unsigned ht, unsigned lv = 0);
 
-	/** Replaces contents of an entire mipmap level.  Allocated storage must
-	exist.  The image data is interpreted according to the storage format and
-	must have size matching the selected mipmap level. */
-	virtual void image(unsigned level, const void *);
+	void image(unsigned level, const void *) override;
 
 	/** Replaces a rectangular 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 selected mipmap level. */
-	void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *);
+	void sub_image(unsigned level, unsigned x, unsigned y, unsigned wd, unsigned ht, const void *);
 
 	virtual void image(const Graphics::Image &, unsigned = 0);
 
@@ -60,11 +57,6 @@ public:
 private:
 	unsigned get_n_levels() const;
 	LinAl::Vector<unsigned, 2> get_level_size(unsigned) const;
-
-public:
-	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
-	virtual std::size_t get_data_size() const;
-	using Texture2DBackend::unload;
 };
 
 } // namespace GL