X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=622599a213d2481acba6707e573286b0d4145f9d;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=bda7599143a11bf05abcf330a58eca6895c3da67;hpb=a4ec5410595ddf37bfbc0e85ad87d31a9cbf94f1;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index bda75991..622599a2 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -18,7 +18,6 @@ namespace GL {
 TexUnit::TexUnit():
 	texture(0)
 {
-	require_version(1, 3);
 }
 
 bool TexUnit::set_texture(const Texture *tex)
@@ -28,12 +27,23 @@ bool TexUnit::set_texture(const Texture *tex)
 	return result;
 }
 
+bool TexUnit::set_texenv(const TexEnv *env)
+{
+	bool result=(texenv!=env);
+	texenv=env;
+	return result;
+}
+
 TexUnit &TexUnit::activate(unsigned n)
 {
 	if(units.size()<=n)
 		units.resize(n+1);
 
-	glActiveTexture(GL_TEXTURE0+n);
+	if(cur_unit!=&units[n] && (cur_unit || n))
+	{
+		static RequireVersion _ver(1, 3);
+		glActiveTexture(GL_TEXTURE0+n);
+	}
 	cur_unit=&units[n];
 
 	return units[n];