X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fsampler.h;h=bd8db31fdc8f9601f5ac2ac55e9762cead38fef4;hp=b2011d3bed3db8dc7631fc3224c37c6011d39c3f;hb=160e9eea29bd10034733d59507fa1bcca36be401;hpb=93448d16e72e38afbaecbccf6fdedd46d6a82a73

diff --git a/source/core/sampler.h b/source/core/sampler.h
index b2011d3b..bd8db31f 100644
--- a/source/core/sampler.h
+++ b/source/core/sampler.h
@@ -4,6 +4,7 @@
 #include <msp/datafile/objectloader.h>
 #include "color.h"
 #include "predicate.h"
+#include "sampler_backend.h"
 
 namespace Msp {
 namespace GL {
@@ -60,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>
@@ -97,7 +98,6 @@ private:
 		COMPARE = 128
 	};
 
-	unsigned id;
 	TextureFilter min_filter;
 	TextureFilter mag_filter;
 	float max_anisotropy;
@@ -153,13 +153,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);
-unsigned get_gl_filter(TextureFilter);
-unsigned get_gl_wrap(TextureWrap);
 
 void operator>>(const LexicalConverter &, TextureFilter &);
 void operator>>(const LexicalConverter &, TextureWrap &);