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

diff --git a/source/core/sampler.h b/source/core/sampler.h
index 852c9710..c7906877 100644
--- a/source/core/sampler.h
+++ b/source/core/sampler.h
@@ -3,8 +3,8 @@
 
 #include <msp/datafile/objectloader.h>
 #include "color.h"
-#include "gl.h"
 #include "predicate.h"
+#include "sampler_backend.h"
 
 namespace Msp {
 namespace GL {
@@ -61,9 +61,9 @@ for magnification and NEAREST_MIPMAP_LINEAR for minification.
 If texture coordinates fall outside of the principal range of the texture,
 wrapping is applied.  The default for all directions is REPEAT.
 */
-class Sampler
+class Sampler: public SamplerBackend
 {
-	friend class PipelineState;
+	friend SamplerBackend;
 
 public:
 	class Loader: public DataFile::ObjectLoader<Sampler>
@@ -98,22 +98,17 @@ private:
 		COMPARE = 128
 	};
 
-	unsigned id;
-	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;
+	TextureFilter min_filter = NEAREST_MIPMAP_LINEAR;
+	TextureFilter mag_filter = LINEAR;
+	float max_anisotropy = 1.0f;
+	TextureWrap wrap_s = REPEAT;
+	TextureWrap wrap_t = REPEAT;
+	TextureWrap wrap_r = REPEAT;
+	Color border_color = { 0.0f, 0.0f, 0.0f, 0.0f };
+	bool compare = false;
+	Predicate cmp_func = LEQUAL;
+	mutable int dirty_params = 0;
 
-public:
-	Sampler();
-
-private:
 	void update() const;
 
 public:
@@ -154,13 +149,11 @@ public:
 
 	void refresh() const { if(dirty_params) update(); }
 
-	void set_debug_name(const std::string &);
+	using SamplerBackend::set_debug_name;
 };
 
 
 bool is_mipmapped(TextureFilter);
-GLenum get_gl_filter(TextureFilter);
-GLenum get_gl_wrap(TextureWrap);
 
 void operator>>(const LexicalConverter &, TextureFilter &);
 void operator>>(const LexicalConverter &, TextureWrap &);