X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=982e524e0189fa74a10181c9a2ff7f7014e8746e;hb=6fd9b09f47ff6a07bd5ca7f9e8887db3486bfcb1;hp=0a5f9bf3a4c4a971489b59d5134204c5c66caa92;hpb=b250a711295f5ba00114f11a5b1c855eebe08d26;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 0a5f9bf3..982e524e 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,6 +1,6 @@
 #include <stdexcept>
-#include "arb_multitexture.h"
-#include "arb_vertex_shader.h"
+#include <msp/gl/extensions/arb_multitexture.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
 #include "gl.h"
 #include "texunit.h"
 
@@ -49,6 +49,13 @@ const TexGen *TexUnit::get_texgen(unsigned i)
 	return texgen[i];
 }
 
+void TexUnit::bind()
+{
+	if(cur_unit!=this && (cur_unit || index))
+		glActiveTexture(GL_TEXTURE0+index);
+	cur_unit = this;
+}
+
 unsigned TexUnit::get_n_units()
 {
 	static int count = -1;
@@ -64,19 +71,20 @@ unsigned TexUnit::get_n_units()
 	return count;
 }
 
-TexUnit &TexUnit::activate(unsigned n)
+TexUnit &TexUnit::get_unit(unsigned n)
 {
 	if(n>0)
 		static Require _req(ARB_multitexture);
 	if(n>=get_n_units())
-		throw out_of_range("TexUnit::activate");
+		throw out_of_range("TexUnit::get_unit");
 
 	if(units.size()<=n)
+	{
+		unsigned i = units.size();
 		units.resize(n+1);
-
-	if(cur_unit!=&units[n] && (cur_unit || n))
-		glActiveTexture(GL_TEXTURE0+n);
-	cur_unit = &units[n];
+		for(; i<units.size(); ++i)
+			units[i].index = i;
+	}
 
 	return units[n];
 }
@@ -84,7 +92,7 @@ TexUnit &TexUnit::activate(unsigned n)
 TexUnit &TexUnit::current()
 {
 	if(!cur_unit)
-		return activate(0);
+		get_unit(0).bind();
 	return *cur_unit;
 }