X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.h;h=30c6496a5658525e00a6ac59374996c25f08d7e3;hb=2ba5af95fb7341b0e6b212e28d03208c6747aae5;hp=71192fef06c42416b8a9dadc26f1fe2109626a67;hpb=9087cc0a372b9c739f15398c7a22c0a6eb5041bb;p=libs%2Fgl.git

diff --git a/source/texture.h b/source/texture.h
index 71192fef..30c6496a 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -64,12 +64,14 @@ protected:
 	{
 		NO_SWIZZLE,
 		R_TO_LUMINANCE,
-		RG_TO_LUMINANCE_ALPHA
+		RG_TO_LUMINANCE_ALPHA,
+		RGB_TO_BGR
 	};
 
 	unsigned id;
 	GLenum target;
-	PixelFormat ifmt;
+	PixelFormat format;
+	PixelFormat storage_fmt;
 	FormatSwizzle swizzle;
 	bool auto_gen_mipmap;
 	Sampler default_sampler;
@@ -83,8 +85,7 @@ public:
 	~Texture();
 
 protected:
-	void set_internal_format(PixelFormat);
-	PixelComponents get_upload_components(PixelComponents) const;
+	void set_format(PixelFormat);
 	void apply_swizzle();
 	void set_parameter_i(GLenum, int) const;