Remove the deprecated ProgramBuilder class

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

diff --git a/source/texunit.h b/source/texunit.h
index 9c4d93f6971ea5b60b10b78b367a60a81092a629..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;
        const Texture *texture;
-       const TexEnv *texenv;
-       const TexGen *texgen[4];
+       const Sampler *sampler;
 
        static std::vector<TexUnit> units;
        static TexUnit *cur_unit;
@@ -30,17 +28,14 @@ public:
        unsigned get_index() const { return index; }
        bool set_texture(const Texture *);
        const Texture *get_texture() const { return texture; }
-       bool set_texenv(const TexEnv *);
-       const TexEnv *get_texenv() const { return texenv; }
-       bool set_texgen(unsigned, const TexGen *);
-       const TexGen *get_texgen(unsigned);
+       bool set_sampler(const Sampler *);
+       const Sampler *get_sampler() const { return sampler; }
        void bind();
 
        static unsigned get_n_units();
        static TexUnit &get_unit(unsigned);
        static TexUnit &current();
        static TexUnit *find_unit(const Texture *);
-       static TexUnit *find_unit(const TexEnv *);
 };
 
 } // namespace GL