Remove the deprecated ProgramBuilder class

[libs/gl.git] / source / texunit.h

diff --git a/source/texunit.h b/source/texunit.h
index 7cf43a7832b4dc6bb3949685f4f90f09a80c1bbb..6253d8d914f52c85f7f9eec6a4beae0fcd733722 100644 (file)
--- a/source/texunit.h
+++ b/source/texunit.h
@@ -6,20 +6,18 @@
 namespace Msp {
 namespace GL {
 
-class TexEnv;
-class TexGen;
+class Sampler;
 class Texture;
 
 /**
-Keeps track of texture unit related state.  Mostly for internal use.
+Keeps track of texture unit related state.  Intended for internal use.
 */
 class TexUnit
 {
 private:
        unsigned index;
-       bool legacy;
        const Texture *texture;
-       bool tex_legacy;
+       const Sampler *sampler;
 
        static std::vector<TexUnit> units;
        static TexUnit *cur_unit;
@@ -28,14 +26,13 @@ private:
 
 public:
        unsigned get_index() const { return index; }
-       bool supports_legacy() const { return legacy; }
-       bool set_texture(const Texture *, bool = true);
+       bool set_texture(const Texture *);
        const Texture *get_texture() const { return texture; }
-       bool get_texture_legacy() const { return tex_legacy; }
+       bool set_sampler(const Sampler *);
+       const Sampler *get_sampler() const { return sampler; }
        void bind();
 
        static unsigned get_n_units();
-       static unsigned get_n_legacy_units();
        static TexUnit &get_unit(unsigned);
        static TexUnit &current();
        static TexUnit *find_unit(const Texture *);