Load textures in a type-generic way

[libs/gl.git] / source / core / sampler.h

diff --git a/source/core/sampler.h b/source/core/sampler.h
index 852c971003359bb7d0f0341dd97becef7242017d..bd8db31fdc8f9601f5ac2ac55e9762cead38fef4 100644 (file)
--- 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,7 +98,6 @@ private:
                COMPARE = 128
        };
 
-       unsigned id;
        TextureFilter min_filter;
        TextureFilter mag_filter;
        float max_anisotropy;
@@ -154,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);
-GLenum get_gl_filter(TextureFilter);
-GLenum get_gl_wrap(TextureWrap);
 
 void operator>>(const LexicalConverter &, TextureFilter &);
 void operator>>(const LexicalConverter &, TextureWrap &);