X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexunit.h;h=6253d8d914f52c85f7f9eec6a4beae0fcd733722;hp=5aec5b31127d032c3cf2da87ba5ba646e04d0643;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=84bc56b96c21c831104a22e0cbd0f3b72ab5d8c3

diff --git a/source/texunit.h b/source/texunit.h
index 5aec5b31..6253d8d9 100644
--- a/source/texunit.h
+++ b/source/texunit.h
@@ -6,24 +6,36 @@
 namespace Msp {
 namespace GL {
 
+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() { return texture; }
-	//TexEnv &get_env() { return env; }
-
-	static TexUnit &activate(unsigned);
-	static TexUnit &current();
 private:
+	unsigned index;
 	const Texture *texture;
-	//TexEnv env;
+	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