X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fsampler.h;h=b2011d3bed3db8dc7631fc3224c37c6011d39c3f;hb=24b24e2203c776aacd9744bb947f5cf47b03d328;hp=524a8fc5f95f01fbee29faa87a7f731c50b0e55d;hpb=97b1f1d97b685155e279d9d02d7c6343ef233ae8;p=libs%2Fgl.git

diff --git a/source/core/sampler.h b/source/core/sampler.h
index 524a8fc5..b2011d3b 100644
--- a/source/core/sampler.h
+++ b/source/core/sampler.h
@@ -3,7 +3,6 @@
 
 #include <msp/datafile/objectloader.h>
 #include "color.h"
-#include "gl.h"
 #include "predicate.h"
 
 namespace Msp {
@@ -63,6 +62,8 @@ wrapping is applied.  The default for all directions is REPEAT.
 */
 class Sampler
 {
+	friend class PipelineState;
+
 public:
 	class Loader: public DataFile::ObjectLoader<Sampler>
 	{
@@ -152,15 +153,13 @@ public:
 
 	void refresh() const { if(dirty_params) update(); }
 
-	unsigned get_id() const { return id; }
-
 	void set_debug_name(const std::string &);
 };
 
 
 bool is_mipmapped(TextureFilter);
-GLenum get_gl_filter(TextureFilter);
-GLenum get_gl_wrap(TextureWrap);
+unsigned get_gl_filter(TextureFilter);
+unsigned get_gl_wrap(TextureWrap);
 
 void operator>>(const LexicalConverter &, TextureFilter &);
 void operator>>(const LexicalConverter &, TextureWrap &);