X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Ftexture2d.h;h=442c544e3c9a52749d5f21c16da70a2a90041875;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hp=8f5c9b21df7df778559e2f52e40bf10bd841144a;hpb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;p=libs%2Fgl.git diff --git a/source/core/texture2d.h b/source/core/texture2d.h index 8f5c9b21..442c544e 100644 --- a/source/core/texture2d.h +++ b/source/core/texture2d.h @@ -56,19 +56,11 @@ public: undefined. If storage has already been allocated, does nothing. */ void allocate(unsigned level); -private: - void allocate_(unsigned level); - -public: /** Updates the contents of the entire texture. Storage must be defined beforehand. The image data must have dimensions and format matching the defined storage. */ virtual void image(unsigned level, const void *data); -private: - void image_(unsigned level, const void *data); - -public: DEPRECATED void image(unsigned level, PixelComponents fmt, DataType type, const void *data); /** Updates a rectangular region of the texture. Storage must be defined @@ -99,7 +91,7 @@ private: public: virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0); - virtual UInt64 get_data_size() const; + virtual std::uint64_t get_data_size() const; virtual void unload(); };