X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.h;h=8508b0435847eaa7eaf9485c5b0765017e4dbe6f;hb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;hp=f1b76783f7e5c5a242c96bb3528d7e7a8929ec40;hpb=a5797c9babd17673285b3b15c7572c2d8fe1595c;p=libs%2Fgl.git

diff --git a/source/texture2d.h b/source/texture2d.h
index f1b76783..8508b043 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -9,8 +9,8 @@ Distributed under the LGPL
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
-#include <msp/datafile/loader.h>
 #include <msp/gbase/image.h>
+#include "datatype.h"
 #include "pixelformat.h"
 #include "texture.h"
 
@@ -30,14 +30,15 @@ public:
 	private:
 		void image_data(const std::string &);
 		void raw_data(const std::string &);
-		void storage(PixelFormat, unsigned, unsigned, unsigned);
+		void storage(PixelFormat, unsigned, unsigned);
+		void storage_b(PixelFormat, unsigned, unsigned, unsigned);
 	};
 
 private:
 	PixelFormat ifmt;
-	sizei width;
-	sizei height;
-	int border;
+	unsigned width;
+	unsigned height;
+	unsigned allocated;
 
 public:
 	Texture2D();
@@ -46,20 +47,22 @@ public:
 	Defines the texture storage.  This function may only be successfully called
 	once.
 	*/
-	void storage(PixelFormat fmt, sizei wd, sizei ht, int brd);
+	void storage(PixelFormat fmt, unsigned wd, unsigned ht);
+
+	/** Allocates texture storage.  If storage has already been allocated, this
+	function does nothing. */
+	void allocate(unsigned level);
 	
-	/**
-	Uploads an image to the texture.  storage() must have been called prior to
+	/** 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, DataType type, const void *data);
+	storage.  For level>0, mipmapping rules apply to the image dimensions. */
+	void image(unsigned level, PixelFormat fmt, DataType 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, DataType type, const void *data);
+	void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data);
 
 	/**
 	Loads an image from a file and uploads it to the texture.  If storage() has
@@ -67,11 +70,13 @@ public:
 	*/
 	void load_image(const std::string &fn);
 
-	sizei get_width() const  { return width; }
-	sizei get_height() const { return height; }
+	unsigned get_width() const  { return width; }
+	unsigned get_height() const { return height; }
 
 private:
 	void image(const Graphics::Image &);
+	void require_storage();
+	void get_level_size(unsigned, unsigned &, unsigned &);
 };
 
 } // namespace GL