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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 91a33ecc..a5427965 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,38 +1,66 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#define GL_GLEXT_PROTOTYPES
-#include <GL/gl.h>
-#include <GL/glext.h>
+#include "extension.h"
+#include "gl.h"
 #include "texunit.h"
+#include "version_1_3.h"
 
 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)
 {
-	bool result=(tex!=texture);
-	texture=tex;
+	bool result = (tex!=texture);
+	texture = tex;
+	return result;
+}
+
+bool TexUnit::set_texenv(const TexEnv *env)
+{
+	bool result = (texenv!=env);
+	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);
 
-	glActiveTextureARB(GL_TEXTURE0+n);
-	cur_unit=&units[n];
+	if(cur_unit!=&units[n] && (cur_unit || n))
+		glActiveTexture(GL_TEXTURE0+n);
+	cur_unit = &units[n];
 
 	return units[n];
 }
@@ -44,8 +72,5 @@ TexUnit &TexUnit::current()
 	return *cur_unit;
 }
 
-vector<TexUnit> TexUnit::units;
-TexUnit *TexUnit::cur_unit=0;
-
 } // namespace GL
 } // namespace Msp