X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.h;h=3a9edae11721c6b626927fed4c5a62e0ab4a72cc;hp=1c750bd1e87d301aed2f79799688e410ef1793bd;hb=f73e671dcb36c097647cddbf5b1eaaad2ffc9299;hpb=4365124bd39bd6edbda6eaef64ec72a1a10565f8 diff --git a/source/core/texture2d.h b/source/core/texture2d.h index 1c750bd1..3a9edae1 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); }; @@ -42,10 +41,7 @@ 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 @@ -60,11 +56,6 @@ public: private: unsigned get_n_levels() const; LinAl::Vector 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