X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.h;h=abccb8d8122de9db6519fff679232d9923392715;hb=5c5d094255ae5b0a07f99392a5a099ad9c8e8e38;hp=44e126570b741a28e4cdd332523bf3d2b7436c0e;hpb=93fa68debcd6e416a1b20f43077f7a79525aaecb;p=libs%2Fgl.git

diff --git a/source/texture.h b/source/texture.h
index 44e12657..abccb8d8 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -104,11 +104,21 @@ protected:
 		GENERATE_MIPMAP = 32,
 		COMPARE = 64,
 		COMPARE_FUNC = 128,
-		MAX_ANISOTROPY = 256
+		MAX_ANISOTROPY = 256,
+		FORMAT_SWIZZLE = 512
+	};
+
+	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;
 	float max_anisotropy;
@@ -120,6 +130,8 @@ protected:
 	Predicate cmp_func;
 	mutable int dirty_params;
 
+	static int swizzle_orders[];
+
 	Texture(GLenum, ResourceManager * = 0);
 	Texture(const Texture &);
 	Texture &operator=(const Texture &);
@@ -128,8 +140,12 @@ 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;
+	void set_parameter_f(GLenum, float) const;
 public:
 	void set_min_filter(TextureFilter);
 	void set_mag_filter(TextureFilter);
@@ -188,6 +204,9 @@ public:
 	virtual UInt64 get_data_size() const { return 0; }
 };
 
+
+bool is_mipmapped(TextureFilter);
+
 } // namespace GL
 } // namespace Msp