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

diff --git a/source/texunit.h b/source/texunit.h
index 9c4d93f6..7cf43a78 100644
--- a/source/texunit.h
+++ b/source/texunit.h
@@ -17,9 +17,9 @@ 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;
@@ -28,19 +28,17 @@ private:
 
 public:
 	unsigned get_index() const { return index; }
-	bool set_texture(const Texture *);
+	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 unsigned get_n_legacy_units();
 	static TexUnit &get_unit(unsigned);
 	static TexUnit &current();
 	static TexUnit *find_unit(const Texture *);
-	static TexUnit *find_unit(const TexEnv *);
 };
 
 } // namespace GL