X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture.h;h=9c43b76911ecb5d00fcf517847f6a04001ed6241;hp=db6165fed82628206f29d69b39036d2160edefca;hb=72a13418cc19e750abf3f8d8a52aea5e1abe4983;hpb=7d7a8f9e77a526fd5f2920b9005805e56a4b686c

diff --git a/source/texture.h b/source/texture.h
index db6165fe..9c43b769 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -2,7 +2,10 @@
 #define MSP_GL_TEXTURE_H_
 
 #include <msp/datafile/objectloader.h>
+#include <msp/graphics/image.h>
+#include "datatype.h"
 #include "gl.h"
+#include "pixelformat.h"
 #include "predicate.h"
 #include "resource.h"
 
@@ -78,8 +81,10 @@ protected:
 	private:
 		void init();
 
+		void external_image(const std::string &);
 		void filter(TextureFilter);
 		void generate_mipmap(bool);
+		void image_data(const std::string &);
 		void mag_filter(TextureFilter);
 		void max_anisotropy(float);
 		void min_filter(TextureFilter);
@@ -99,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;
@@ -115,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 &);
@@ -122,7 +139,13 @@ public:
 	~Texture();
 
 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);
@@ -140,6 +163,8 @@ public:
 	void set_wrap_t(TextureWrap);
 	void set_wrap_r(TextureWrap);
 
+	static bool can_generate_mipmap();
+
 	/** Sets automatic mipmap generation.  If enabled, mipmaps are generated
 	when a texture image is uploaded. */
 	void set_generate_mipmap(bool);
@@ -157,6 +182,17 @@ public:
 	/** Sets the function to use for depth comparison. */
 	void set_compare_func(Predicate);
 
+	/// Loads a Graphics::Image from a file and uploads it to the texture.
+	virtual void load_image(const std::string &, bool srgb = false);
+
+	/** Uploads an image to the texture.  If storage has not been defined, it
+	will be set to match the image.  Otherwise the image must be compatible
+	with the defined storage.  Semantics depend on the type of texture.
+
+	If srgb is true and storage is determined by this call, then an sRGB pixel
+	format will be used. */
+	virtual void image(const Graphics::Image &, bool srgb = false) = 0;
+
 	GLenum get_target() const { return target; }
 	unsigned get_id() const { return id; }
 
@@ -170,6 +206,9 @@ public:
 	virtual UInt64 get_data_size() const { return 0; }
 };
 
+
+bool is_mipmapped(TextureFilter);
+
 } // namespace GL
 } // namespace Msp