X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.h;h=6c0fbf2574b6cb6f8a897e62f0977b8db9486e4f;hb=2edfcf08707c3627b6b27289ba607a7183d63b01;hp=adcfa76b7245276078af013622f343dca8ac65f0;hpb=73eec11d44a24bac121f1b0d85f20d58005f3545;p=libs%2Fgl.git

diff --git a/source/texture.h b/source/texture.h
index adcfa76b..6c0fbf25 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -64,7 +64,8 @@ protected:
 	{
 		NO_SWIZZLE,
 		R_TO_LUMINANCE,
-		RG_TO_LUMINANCE_ALPHA
+		RG_TO_LUMINANCE_ALPHA,
+		RGB_TO_BGR
 	};
 
 	unsigned id;
@@ -83,9 +84,8 @@ public:
 	~Texture();
 
 protected:
-	static DataType get_alloc_type(PixelFormat);
 	void set_internal_format(PixelFormat);
-	PixelFormat get_upload_format(PixelFormat) const;
+	PixelComponents get_upload_components(PixelComponents) const;
 	void apply_swizzle();
 	void set_parameter_i(GLenum, int) const;