X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.h;h=abe6c8879e5dbd07469bc1319e2fc2e6ac91230a;hb=e1be82a4dfce8d90358c506f65be09da4dc9d5ec;hp=7ef55f80fdf17ec9c295efff74f2e914dd91e975;hpb=190a7e11237351f6b730c28f7b16f183e8adc69c;p=libs%2Fgl.git

diff --git a/source/core/texture1d.h b/source/core/texture1d.h
index 7ef55f80..abe6c887 100644
--- a/source/core/texture1d.h
+++ b/source/core/texture1d.h
@@ -23,14 +23,12 @@ public:
 	private:
 		void init();
 
-		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned);
 		void storage_levels(PixelFormat, unsigned, unsigned);
 	};
 
 private:
 	unsigned width = 0;
-	unsigned levels = 0;
 
 public:
 	/** Sets storage format and size and allocates memory for the texture.  If
@@ -38,28 +36,19 @@ public:
 	cannot be changed once set. */
 	void storage(PixelFormat, unsigned wd, 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. */
-	void image(unsigned level, const void *);
+	virtual void image(unsigned level, const void *);
 
 	/** Replaces a range of texels in the texture.  Allocated storage must
 	exist.  The image data is interpreted according to the storage format and
 	the range must be fully inside the selected mipmap level. */
-	void sub_image(unsigned level, int x, unsigned wd, const void *);
+	void sub_image(unsigned level, unsigned x, unsigned wd, const void *);
 
 	virtual void image(const Graphics::Image &, unsigned = 0);
 
 	unsigned get_width() const { return width; }
 
 private:
-	unsigned get_n_levels() const;
 	unsigned 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