X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture.h;h=f6436c0acc8f6e51d7d8679710bbaf47ad29b67b;hb=8e58fc4da8443cb67fe4cd70d6f68de2be73011d;hp=8db5dad83e0a90e6aa1bcde5a641f487a5e88355;hpb=260ecf71f02d4b3397e4f6c80d96a7c4ba473185;p=libs%2Fgl.git

diff --git a/source/core/texture.h b/source/core/texture.h
index 8db5dad8..f6436c0a 100644
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -49,6 +49,7 @@ protected:
 		void load_external_image(Graphics::Image &, const std::string &);
 
 	private:
+		void external_data(const std::string &);
 		void external_image(bool, const std::string &);
 		void generate_mipmap(bool);
 		void image_data(const std::string &);
@@ -69,17 +70,9 @@ public:
 	};
 
 protected:
-	enum FormatSwizzle
-	{
-		NO_SWIZZLE,
-		R_TO_LUMINANCE,
-		RG_TO_LUMINANCE_ALPHA,
-		RGB_TO_BGR
-	};
-
 	PixelFormat format;
 	PixelFormat storage_fmt;
-	FormatSwizzle swizzle;
+	ComponentSwizzle swizzle;
 	bool use_srgb_format;
 	bool auto_gen_mipmap;