X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=a542796548f0ae120bc9037b81bf0e2e3071c0fd;hb=6a4907898281b738111e0c6527cc46f8810dc123;hp=1155fa96286be0ab199280e61ea909115545df30;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 1155fa96..a5427965 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -15,10 +15,13 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+vector<TexUnit> TexUnit::units;
+TexUnit *TexUnit::cur_unit = 0;
+
 TexUnit::TexUnit():
-	texture(0)
-{
-}
+	texture(0),
+	texenv(0)
+{ }
 
 bool TexUnit::set_texture(const Texture *tex)
 {
@@ -34,16 +37,29 @@ bool TexUnit::set_texenv(const TexEnv *env)
 	return result;
 }
 
+unsigned TexUnit::get_n_units()
+{
+	static int count = -1;
+	if(count<0)
+		// XXX Should use GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS since GL 2.0
+		glGetIntegerv(GL_MAX_TEXTURE_UNITS, &count);
+	return count;
+}
+
 TexUnit &TexUnit::activate(unsigned n)
 {
+	if(n>0)
+	{
+		static RequireVersion _ver(1, 3);
+		if(n>=get_n_units())
+			throw InvalidParameterValue("Invalid texture unit number");
+	}
+
 	if(units.size()<=n)
 		units.resize(n+1);
 
 	if(cur_unit!=&units[n] && (cur_unit || n))
-	{
-		static RequireVersion _ver(1, 3);
 		glActiveTexture(GL_TEXTURE0+n);
-	}
 	cur_unit = &units[n];
 
 	return units[n];
@@ -56,8 +72,5 @@ TexUnit &TexUnit::current()
 	return *cur_unit;
 }
 
-vector<TexUnit> TexUnit::units;
-TexUnit *TexUnit::cur_unit = 0;
-
 } // namespace GL
 } // namespace Msp