X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fsampler.h;h=79aea8f8b76621f6ed9f5e5f44d0df08bf84aa0d;hb=96bbfddc653826ee9848c468c53bca024711a6c3;hp=4208f069da4f4c6566c2fca362949ef20702d51b;hpb=be2d4eb0b735500a50d20ee2d9979c9f17d79e3a;p=libs%2Fgl.git

diff --git a/source/core/sampler.h b/source/core/sampler.h
index 4208f069..79aea8f8 100644
--- a/source/core/sampler.h
+++ b/source/core/sampler.h
@@ -2,6 +2,7 @@
 #define MSP_GL_SAMPLER_H_
 
 #include <msp/datafile/objectloader.h>
+#include "color.h"
 #include "gl.h"
 #include "predicate.h"
 
@@ -38,6 +39,9 @@ enum TextureWrap
 	/// Extend the texels at the edge of the texture to infinity
 	CLAMP_TO_EDGE = GL_CLAMP_TO_EDGE,
 
+	/// Sampling outside the texture will return border color
+	CLAMP_TO_BORDER = GL_CLAMP_TO_BORDER,
+
 	/// Tile the texture, with every other repetition mirrored
 	MIRRORED_REPEAT = GL_MIRRORED_REPEAT
 };
@@ -69,6 +73,7 @@ public:
 	private:
 		void init();
 
+		void border_color(float, float, float, float);
 		void compare(Predicate);
 		void filter(TextureFilter);
 		void mag_filter(TextureFilter);
@@ -89,7 +94,8 @@ private:
 		WRAP_S = 8,
 		WRAP_T = 16,
 		WRAP_R = 32,
-		COMPARE = 64
+		BORDER_COLOR = 64,
+		COMPARE = 128
 	};
 
 	unsigned id;
@@ -100,6 +106,7 @@ private:
 	TextureWrap wrap_s;
 	TextureWrap wrap_t;
 	TextureWrap wrap_r;
+	Color border_color;
 	bool compare;
 	Predicate cmp_func;
 	mutable int dirty_params;
@@ -113,6 +120,7 @@ private:
 	void update_parameter(int) const;
 	void set_parameter_i(unsigned, int) const;
 	void set_parameter_f(unsigned, float) const;
+	void set_parameter_fv(unsigned, const float *) const;
 
 public:
 	void set_min_filter(TextureFilter);
@@ -135,6 +143,9 @@ public:
 	void set_wrap_t(TextureWrap);
 	void set_wrap_r(TextureWrap);
 
+	void set_border_color(const Color &);
+	const Color &get_border_color() const { return border_color; }
+
 	/** Disables depth comparison. */
 	void disable_compare();