Remove the deprecated ProgramBuilder class

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

diff --git a/source/texunit.h b/source/texunit.h
index 1b616505ac5d2ea3d6f90cfc54ea5ee9cf6c4ded..6253d8d914f52c85f7f9eec6a4beae0fcd733722 100644 (file)
--- a/source/texunit.h
+++ b/source/texunit.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_TEXUNIT_H_
 #define MSP_GL_TEXUNIT_H_
 
@@ -13,26 +6,36 @@ Distributed under the LGPL
 namespace Msp {
 namespace GL {
 
-class TexEnv;
+class Sampler;
 class Texture;
 
+/**
+Keeps track of texture unit related state.  Intended for internal use.
+*/
 class TexUnit
 {
-public:
-       TexUnit();
-       bool set_texture(const Texture *);
-       const Texture *get_texture() const { return texture; }
-       bool set_texenv(const TexEnv *);
-       const TexEnv *get_texenv() const { return texenv; }
-
-       static TexUnit &activate(unsigned);
-       static TexUnit &current();
 private:
+       unsigned index;
        const Texture *texture;
-       const TexEnv *texenv;
+       const Sampler *sampler;
 
        static std::vector<TexUnit> units;
        static TexUnit *cur_unit;
+
+       TexUnit();
+
+public:
+       unsigned get_index() const { return index; }
+       bool set_texture(const Texture *);
+       const Texture *get_texture() const { return texture; }
+       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 *);
 };
 
 } // namespace GL