X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture.h;h=19da006937cf536aef73bc9ae43e0ba3bc3472b1;hp=f1a51767f577771477289c582375ab2170c98c11;hb=56beca9d8b4f7b4edac81411d31e24df88e84ac3;hpb=08e19bc2b4eba572bc7699378cf55cd8772ac67e

diff --git a/source/texture.h b/source/texture.h
index f1a51767..19da0069 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -88,6 +88,7 @@ protected:
 		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);
@@ -104,22 +105,36 @@ protected:
 		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;
+	Msp::UInt8 auto_gen_mipmap;
 	bool compare;
 	Predicate cmp_func;
 	mutable int dirty_params;
 
+	static int swizzle_orders[];
+
 	Texture(GLenum, ResourceManager * = 0);
 	Texture(const Texture &);
 	Texture &operator=(const Texture &);
@@ -128,6 +143,8 @@ public:
 
 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;
@@ -140,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. */
@@ -149,14 +168,17 @@ 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);
 
-protected:
-	void auto_generate_mipmap();
+	/// Deprecated.  Use set_auto_generate_mipmap instead.
+	void set_generate_mipmap(bool g) { set_auto_generate_mipmap(g); }
 
-public:
 	/** Sets depth texture comparison.  Has no effect on other formats.  When
 	comparison is enabled, the third component of the texture coordinate is
 	compared against the texel value, and the result is returned as the texture
@@ -180,13 +202,16 @@ public:
 	GLenum get_target() const { return target; }
 	unsigned get_id() const { return id; }
 
-	void bind() const { bind_to(0); }
-	void bind_to(unsigned) const;
+	void bind(bool legacy = true) const { bind_to(0, legacy); }
+	void bind_to(unsigned, bool = true) const;
 
 	static const Texture *current(unsigned = 0);
 	static void unbind() { unbind_from(0); }
 	static void unbind_from(unsigned);
+private:
+	static bool is_legacy_target(GLenum);
 
+public:
 	virtual UInt64 get_data_size() const { return 0; }
 };