X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexunit.h;h=7cf43a7832b4dc6bb3949685f4f90f09a80c1bbb;hp=82c4b5795baafa5a095e1eb126b0b146ba5b5f63;hb=025016d7628be9c43b20999325dcbaae5cb3c3b8;hpb=777f5f37f2d89ef2a787a77d74372b643968740e

diff --git a/source/texunit.h b/source/texunit.h
index 82c4b579..7cf43a78 100644
--- a/source/texunit.h
+++ b/source/texunit.h
@@ -10,29 +10,35 @@ class TexEnv;
 class TexGen;
 class Texture;
 
+/**
+Keeps track of texture unit related state.  Mostly for internal use.
+*/
 class TexUnit
 {
 private:
+	unsigned index;
+	bool legacy;
 	const Texture *texture;
-	const TexEnv *texenv;
-	const TexGen *texgen[4];
+	bool tex_legacy;
 
 	static std::vector<TexUnit> units;
 	static TexUnit *cur_unit;
 
-public:
 	TexUnit();
 
-	bool set_texture(const Texture *);
+public:
+	unsigned get_index() const { return index; }
+	bool supports_legacy() const { return legacy; }
+	bool set_texture(const Texture *, bool = true);
 	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 get_texture_legacy() const { return tex_legacy; }
+	void bind();
 
 	static unsigned get_n_units();
-	static TexUnit &activate(unsigned);
+	static unsigned get_n_legacy_units();
+	static TexUnit &get_unit(unsigned);
 	static TexUnit &current();
+	static TexUnit *find_unit(const Texture *);
 };
 
 } // namespace GL