X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.h;h=5f4a7f9293e49f90781dbeaa50322cd6cc90747c;hb=48fc090a59a5ff5c3f06ffe1acfe77b06dad2a86;hp=012718528af72592039831c2a27c69b6a58aa728;hpb=ceae2a27dfc58310c5bab7e3aa3fedf0fa9a1f49;p=libs%2Fgl.git

diff --git a/source/texture2d.h b/source/texture2d.h
index 01271852..5f4a7f92 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -1,15 +1,8 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_TEXTURE2D_H_
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
-#include <msp/gbase/image.h>
+#include <msp/graphics/image.h>
 #include "datatype.h"
 #include "pixelformat.h"
 #include "texture.h"
@@ -30,14 +23,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;
 	unsigned width;
 	unsigned height;
-	int border;
+	unsigned allocated;
 
 public:
 	Texture2D();
@@ -46,20 +40,22 @@ public:
 	Defines the texture storage.  This function may only be successfully called
 	once.
 	*/
-	void storage(PixelFormat fmt, unsigned wd, unsigned 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, unsigned wd, unsigned 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
@@ -72,6 +68,7 @@ public:
 
 private:
 	void image(const Graphics::Image &);
+	void get_level_size(unsigned, unsigned &, unsigned &);
 };
 
 } // namespace GL