X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.h;h=3fa29f60603ca66272d306b9cbe35c49e1d0ea27;hb=c1e297b01f07be122e9909a1ae9c04f0c51dfc21;hp=477eaca382fa55dbe6ab1925fb62677db1ed72c1;hpb=e37851b98dde5082ee92570354746f2f92e21940;p=libs%2Fgl.git

diff --git a/source/texture.h b/source/texture.h
index 477eaca3..3fa29f60 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -1,15 +1,18 @@
 #ifndef MSP_GL_TEXTURE_H_
 #define MSP_GL_TEXTURE_H_
 
+#include <msp/core/attributes.h>
 #include <msp/datafile/objectloader.h>
+#include <msp/graphics/image.h>
+#include "datatype.h"
 #include "gl.h"
+#include "pixelformat.h"
 #include "predicate.h"
+#include "resource.h"
 
 namespace Msp {
 namespace GL {
 
-class Resources;
-
 enum TextureFilter
 {
 	/// No filtering
@@ -65,7 +68,7 @@ texture to be usable.
 If texture coordinates fall outside of the principal range of the texture,
 wrapping is applied.  The default for all directions is REPEAT.
 */
-class Texture
+class Texture: public Resource
 {
 protected:
 	class Loader: public DataFile::CollectionObjectLoader<Texture>
@@ -79,11 +82,14 @@ protected:
 	private:
 		void init();
 
+		void external_image(const std::string &);
 		void filter(TextureFilter);
 		void generate_mipmap(bool);
+		void image_data(const std::string &);
 		void mag_filter(TextureFilter);
 		void max_anisotropy(float);
 		void min_filter(TextureFilter);
+		void mipmap_levels(unsigned);
 		void wrap(TextureWrap);
 		void wrap_r(TextureWrap);
 		void wrap_s(TextureWrap);
@@ -97,33 +103,52 @@ protected:
 		WRAP_S = 4,
 		WRAP_T = 8,
 		WRAP_R = 16,
-		GENERATE_MIPMAP = 32,
 		COMPARE = 64,
 		COMPARE_FUNC = 128,
-		MAX_ANISOTROPY = 256
+		MAX_ANISOTROPY = 256,
+		FORMAT_SWIZZLE = 512,
+		MIPMAP_LEVELS = 1024
+	};
+
+	enum FormatSwizzle
+	{
+		NO_SWIZZLE,
+		R_TO_LUMINANCE,
+		RG_TO_LUMINANCE_ALPHA
 	};
 
 	unsigned id;
 	GLenum target;
+	PixelFormat ifmt;
+	FormatSwizzle swizzle;
 	TextureFilter min_filter;
 	TextureFilter mag_filter;
+	unsigned mipmap_levels;
 	float max_anisotropy;
 	TextureWrap wrap_s;
 	TextureWrap wrap_t;
 	TextureWrap wrap_r;
-	bool gen_mipmap;
+	bool auto_gen_mipmap;
 	bool compare;
 	Predicate cmp_func;
 	mutable int dirty_params;
 
-	Texture(GLenum);
+	static int swizzle_orders[];
+
+	Texture(GLenum, ResourceManager * = 0);
 	Texture(const Texture &);
 	Texture &operator=(const Texture &);
 public:
 	~Texture();
 
 protected:
+	static DataType get_alloc_type(PixelFormat);
+	void set_internal_format(PixelFormat);
+	PixelFormat get_upload_format(PixelFormat) const;
+
 	void update_parameter(int) const;
+	void set_parameter_i(GLenum, int) const;
+	void set_parameter_f(GLenum, float) const;
 public:
 	void set_min_filter(TextureFilter);
 	void set_mag_filter(TextureFilter);
@@ -132,6 +157,8 @@ public:
 	is not applicable to magnification, LINEAR is used instead. */
 	void set_filter(TextureFilter);
 
+	void set_mipmap_levels(unsigned);
+
 	void set_max_anisotropy(float);
 
 	/** Sets the wrapping mode for all coordinates. */
@@ -141,9 +168,16 @@ public:
 	void set_wrap_t(TextureWrap);
 	void set_wrap_r(TextureWrap);
 
+	static bool can_generate_mipmap();
+
+	void generate_mipmap();
+
 	/** Sets automatic mipmap generation.  If enabled, mipmaps are generated
 	when a texture image is uploaded. */
-	void set_generate_mipmap(bool);
+	void set_auto_generate_mipmap(bool);
+
+	/// Deprecated.  Use set_auto_generate_mipmap instead.
+	DEPRECATED void set_generate_mipmap(bool g) { set_auto_generate_mipmap(g); }
 
 	/** Sets depth texture comparison.  Has no effect on other formats.  When
 	comparison is enabled, the third component of the texture coordinate is
@@ -154,6 +188,17 @@ public:
 	/** Sets the function to use for depth comparison. */
 	void set_compare_func(Predicate);
 
+	/// Loads a Graphics::Image from a file and uploads it to the texture.
+	virtual void load_image(const std::string &, 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.  Semantics depend on the type of texture.
+
+	If srgb is true and storage is determined by this call, then an sRGB pixel
+	format will be used. */
+	virtual void image(const Graphics::Image &, bool srgb = false) = 0;
+
 	GLenum get_target() const { return target; }
 	unsigned get_id() const { return id; }
 
@@ -163,8 +208,13 @@ public:
 	static const Texture *current(unsigned = 0);
 	static void unbind() { unbind_from(0); }
 	static void unbind_from(unsigned);
+
+	virtual UInt64 get_data_size() const { return 0; }
 };
 
+
+bool is_mipmapped(TextureFilter);
+
 } // namespace GL
 } // namespace Msp