X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture.h;h=96b17b8910752e0f0f46f7466b2acf7d014e2746;hp=639b15f5b711c820e8ff448f6d634078e2040ded;hb=HEAD;hpb=b274dc87db4422498e72823649358114dfca0096

diff --git a/source/core/texture.h b/source/core/texture.h
index 639b15f5..96b17b89 100644
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -70,23 +70,19 @@ public:
 	};
 
 protected:
-	enum FormatSwizzle
-	{
-		NO_SWIZZLE,
-		R_TO_LUMINANCE,
-		RG_TO_LUMINANCE_ALPHA,
-		RGB_TO_BGR
-	};
-
-	PixelFormat format;
-	PixelFormat storage_fmt;
-	FormatSwizzle swizzle;
-	bool use_srgb_format;
-	bool auto_gen_mipmap;
+	PixelFormat format = NO_PIXELFORMAT;
+	PixelFormat storage_fmt = NO_PIXELFORMAT;
+	ComponentSwizzle swizzle = NO_SWIZZLE;
+	unsigned n_levels = 0;
+	bool use_srgb_format = false;
+	bool auto_gen_mipmap = false;
 
 	Texture(unsigned);
 
 	void set_format(PixelFormat);
+	static unsigned count_levels(unsigned);
+
+	void stage_pixels(void *, const void *, std::size_t);
 
 public:
 	PixelFormat get_format() const { return format; }