X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=714b65027d1786f03865bdfd22ab7d3851440f2b;hb=27fe0982fc18d1f5f9efe942e18c42f508268f34;hp=b19e791727c0e9f6d006c7a51eb58d3b0d634ed2;hpb=6afbace895a7bbcf216ab8e48280ea0303ab5892;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index b19e7917..714b6502 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,7 +1,8 @@
 #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 "misc.h"
 #include "texunit.h"
 
 using namespace std;
@@ -36,7 +37,7 @@ bool TexUnit::set_texenv(const TexEnv *env)
 bool TexUnit::set_texgen(unsigned i, const TexGen *gen)
 {
 	if(i>=4)
-		throw invalid_argument("TexUnit::set_texgen");
+		throw out_of_range("TexUnit::set_texgen");
 	bool result = (texgen[i]!=gen);
 	texgen[i] = gen;
 	return result;
@@ -45,38 +46,46 @@ bool TexUnit::set_texgen(unsigned i, const TexGen *gen)
 const TexGen *TexUnit::get_texgen(unsigned i)
 {
 	if(i>=4)
-		throw invalid_argument("TexUnit::get_texgen");
+		throw out_of_range("TexUnit::get_texgen");
 	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;
 	if(count<0)
 	{
 		if(ARB_vertex_shader)
-			glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &count);
+			count = get_i(GL_MAX_TEXTURE_IMAGE_UNITS);
 		else if(ARB_multitexture)
-			glGetIntegerv(GL_MAX_TEXTURE_UNITS, &count);
+			count = get_i(GL_MAX_TEXTURE_UNITS);
 		else
 			count = 1;
 	}
 	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,9 +93,25 @@ TexUnit &TexUnit::activate(unsigned n)
 TexUnit &TexUnit::current()
 {
 	if(!cur_unit)
-		return activate(0);
+		get_unit(0).bind();
 	return *cur_unit;
 }
 
+TexUnit *TexUnit::find_unit(const Texture *tex)
+{
+	for(vector<TexUnit>::iterator i=units.begin(); i!=units.end(); ++i)
+		if(i->texture==tex)
+			return &*i;
+	return 0;
+}
+
+TexUnit *TexUnit::find_unit(const TexEnv *env)
+{
+	for(vector<TexUnit>::iterator i=units.begin(); i!=units.end(); ++i)
+		if(i->texenv==env)
+			return &*i;
+	return 0;
+}
+
 } // namespace GL
 } // namespace Msp