From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 27 Nov 2013 08:30:26 +0000 (+0200)
Subject: Make TexUnits aware of their incides
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;ds=sidebyside;h=706d49dc7ca9b3969f6f79db16b0cc02576f3de3;p=libs%2Fgl.git

Make TexUnits aware of their incides
---

diff --git a/source/texunit.cpp b/source/texunit.cpp
index aa52aed4..2b3418fe 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -72,7 +72,12 @@ TexUnit &TexUnit::activate(unsigned n)
 		throw out_of_range("TexUnit::activate");
 
 	if(units.size()<=n)
+	{
+		unsigned i = units.size();
 		units.resize(n+1);
+		for(; i<units.size(); ++i)
+			units[i].index = i;
+	}
 
 	if(cur_unit!=&units[n] && (cur_unit || n))
 		glActiveTexture(GL_TEXTURE0+n);
diff --git a/source/texunit.h b/source/texunit.h
index 82c4b579..93f6dd08 100644
--- a/source/texunit.h
+++ b/source/texunit.h
@@ -13,6 +13,7 @@ class Texture;
 class TexUnit
 {
 private:
+	unsigned index;
 	const Texture *texture;
 	const TexEnv *texenv;
 	const TexGen *texgen[4];
@@ -23,6 +24,7 @@ private:
 public:
 	TexUnit();
 
+	unsigned get_index() const { return index; }
 	bool set_texture(const Texture *);
 	const Texture *get_texture() const { return texture; }
 	bool set_texenv(const TexEnv *);