X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fsampler.h;h=852c971003359bb7d0f0341dd97becef7242017d;hb=2e09b4f72f06537431151fe8b2574e1aa886ad48;hp=4208f069da4f4c6566c2fca362949ef20702d51b;hpb=69e7127d18035fabcf2f5ab40fa8ce5b9acea003;p=libs%2Fgl.git

diff --git a/source/core/sampler.h b/source/core/sampler.h
index 4208f069..852c9710 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"
 
@@ -11,39 +12,40 @@ namespace GL {
 enum TextureFilter
 {
 	/// No filtering
-	NEAREST = GL_NEAREST,
+	NEAREST,
 
 	/// Bilinear filtering
-	LINEAR = GL_LINEAR,
+	LINEAR,
 
 	/// Mipmapping without filtering
-	NEAREST_MIPMAP_NEAREST = GL_NEAREST_MIPMAP_NEAREST,
+	NEAREST_MIPMAP_NEAREST,
 
 	/// Linear filtering between two mipmap levels
-	NEAREST_MIPMAP_LINEAR = GL_NEAREST_MIPMAP_LINEAR,
+	NEAREST_MIPMAP_LINEAR,
 
 	/// Bilinear filtering on the closest mipmap level
-	LINEAR_MIPMAP_NEAREST = GL_LINEAR_MIPMAP_NEAREST,
+	LINEAR_MIPMAP_NEAREST,
 
 	/// Trilinear filtering between two mipmap levels
-	LINEAR_MIPMAP_LINEAR = GL_LINEAR_MIPMAP_LINEAR
+	LINEAR_MIPMAP_LINEAR
 };
 
 
 enum TextureWrap
 {
 	/// Tile the texture infinitely
-	REPEAT = GL_REPEAT,
+	REPEAT,
 
 	/// Extend the texels at the edge of the texture to infinity
-	CLAMP_TO_EDGE = GL_CLAMP_TO_EDGE,
+	CLAMP_TO_EDGE,
+
+	/// Sampling outside the texture will return border color
+	CLAMP_TO_BORDER,
 
 	/// Tile the texture, with every other repetition mirrored
-	MIRRORED_REPEAT = GL_MIRRORED_REPEAT
+	MIRRORED_REPEAT
 };
 
-class Texture;
-
 
 /**
 Samplers are used to access texture data in shaders.  To use a sampler with a
@@ -61,6 +63,8 @@ wrapping is applied.  The default for all directions is REPEAT.
 */
 class Sampler
 {
+	friend class PipelineState;
+
 public:
 	class Loader: public DataFile::ObjectLoader<Sampler>
 	{
@@ -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,30 +94,27 @@ private:
 		WRAP_S = 8,
 		WRAP_T = 16,
 		WRAP_R = 32,
-		COMPARE = 64
+		BORDER_COLOR = 64,
+		COMPARE = 128
 	};
 
 	unsigned id;
-	const Texture *owner;
 	TextureFilter min_filter;
 	TextureFilter mag_filter;
 	float max_anisotropy;
 	TextureWrap wrap_s;
 	TextureWrap wrap_t;
 	TextureWrap wrap_r;
+	Color border_color;
 	bool compare;
 	Predicate cmp_func;
 	mutable int dirty_params;
 
 public:
 	Sampler();
-	Sampler(const Texture &);
-private:
-	void init();
 
-	void update_parameter(int) const;
-	void set_parameter_i(unsigned, int) const;
-	void set_parameter_f(unsigned, float) const;
+private:
+	void update() const;
 
 public:
 	void set_min_filter(TextureFilter);
@@ -135,6 +137,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();
 
@@ -147,18 +152,15 @@ public:
 	bool is_compare_enabled() const { return compare; }
 	Predicate get_compare_function() const { return cmp_func; }
 
-	void bind() const { bind_to(0); }
-	void bind_to(unsigned) const;
-
-	static const Sampler *current(unsigned = 0);
-	static void unbind() { unbind_from(0); }
-	static void unbind_from(unsigned);
+	void refresh() const { if(dirty_params) update(); }
 
-	void unload();
+	void set_debug_name(const std::string &);
 };
 
 
 bool is_mipmapped(TextureFilter);
+GLenum get_gl_filter(TextureFilter);
+GLenum get_gl_wrap(TextureWrap);
 
 void operator>>(const LexicalConverter &, TextureFilter &);
 void operator>>(const LexicalConverter &, TextureWrap &);