X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=9b905120db6861d54204b172264d58c6f5340383;hb=f1b12c992db974c679d85ae6ec22cd318199d0d5;hp=aa52aed4525a1c398aa2cf6f08793388074a723f;hpb=619aae12e01f25e79626a94c973927e5599e99a5;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index aa52aed4..9b905120 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -2,6 +2,7 @@
 #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;
@@ -13,11 +14,8 @@ vector<TexUnit> TexUnit::units;
 TexUnit *TexUnit::cur_unit = 0;
 
 TexUnit::TexUnit():
-	texture(0),
-	texenv(0)
-{
-	fill(texgen, texgen+4, static_cast<const TexGen *>(0));
-}
+	texture(0)
+{ }
 
 bool TexUnit::set_texture(const Texture *tex)
 {
@@ -26,27 +24,11 @@ bool TexUnit::set_texture(const Texture *tex)
 	return result;
 }
 
-bool TexUnit::set_texenv(const TexEnv *env)
-{
-	bool result = (texenv!=env);
-	texenv = env;
-	return result;
-}
-
-bool TexUnit::set_texgen(unsigned i, const TexGen *gen)
-{
-	if(i>=4)
-		throw out_of_range("TexUnit::set_texgen");
-	bool result = (texgen[i]!=gen);
-	texgen[i] = gen;
-	return result;
-}
-
-const TexGen *TexUnit::get_texgen(unsigned i)
+void TexUnit::bind()
 {
-	if(i>=4)
-		throw out_of_range("TexUnit::get_texgen");
-	return texgen[i];
+	if(cur_unit!=this && (cur_unit || index))
+		glActiveTexture(GL_TEXTURE0+index);
+	cur_unit = this;
 }
 
 unsigned TexUnit::get_n_units()
@@ -55,28 +37,29 @@ unsigned TexUnit::get_n_units()
 	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)
-		units.resize(n+1);
-
-	if(cur_unit!=&units[n] && (cur_unit || n))
-		glActiveTexture(GL_TEXTURE0+n);
-	cur_unit = &units[n];
+	{
+		unsigned i = units.size();
+		units.resize(n+1, TexUnit());
+		for(; i<units.size(); ++i)
+			units[i].index = i;
+	}
 
 	return units[n];
 }
@@ -84,9 +67,17 @@ 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;
+}
+
 } // namespace GL
 } // namespace Msp