- Texture2D();
-
- /**
- Defines the texture storage. This function may only be successfully called
- once.
- */
- void storage(PixelFormat fmt, sizei wd, sizei ht, int brd);
-
- /**
- Uploads an image to the texture. storage() must have been called prior to
- this, and the image must have dimensions conforming to the specified
- storage.
- */
- void image(int level, PixelFormat fmt, GLenum type, const void *data);
-
- /**
- Uploads a sub-image into the texture. Unlike full image upload, there are
- no constraints on the size of the sub-image.
- */
- void sub_image(int level, int x, int y, sizei wd, sizei ht, PixelFormat fmt, GLenum type, const void *data);
-
- /**
- Loads an image from a file and uploads it to the texture. If storage() has
- not been called, the storage format will be set to match the loaded image.
- */
- void load_image(const std::string &fn);
-
- sizei get_width() const { return width; }
- sizei get_height() const { return height; }
+ Texture2D(ResourceManager * = 0);
+
+ /** Defines storage structure for the texture. Must be called before an
+ image can be uploaded. Once storage is defined, it can't be changed. */
+ void storage(PixelFormat fmt, unsigned wd, unsigned ht);
+
+ /** Allocates storage for the texture. The contents are initially
+ undefined. If storage has already been allocated, does nothing. */
+ void allocate(unsigned level);
+
+ /** Uploads an image to the texture. Storage must be defined beforehand.
+ The image data must have dimensions and format compatible with the defined
+ storage. */
+ void image(unsigned level, PixelFormat fmt, DataType type, const void *data);
+
+ /** Updates a rectangular region of the texture. Storage must be defined
+ and allocated beforehand. The update region must be fully inside the
+ texture. */
+ void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
+ PixelFormat fmt, DataType type, const void *data);
+
+ /// Loads a Graphics::Image from a file and uploads it to the texture.
+ void load_image(const std::string &fn, bool srgb = false);
+
+ /** Uploads an image to the texture. If storage has not been defined, it
+ will be set to match the image. Otherwise the image must be compatible with
+ the defined storage.
+
+ If srgb is true and storage is determined by this call, then an sRGB pixel
+ format will be used. */
+ void image(const Graphics::Image &, bool srgb = false);