X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexunit.cpp;h=0659d6154e80523ffaa0baf75f6bf00ff96a05f2;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=2b3418fee43cb4fe7a7f0276ad2f6ffdb2d602ea;hpb=706d49dc7ca9b3969f6f79db16b0cc02576f3de3;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 2b3418fe..0659d615 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -2,6 +2,8 @@
 #include <msp/gl/extensions/arb_multitexture.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
 #include "gl.h"
+#include "misc.h"
+#include "texture.h"
 #include "texunit.h"
 
 using namespace std;
@@ -14,10 +16,8 @@ TexUnit *TexUnit::cur_unit = 0;
 
 TexUnit::TexUnit():
 	texture(0),
-	texenv(0)
-{
-	fill(texgen, texgen+4, static_cast<const TexGen *>(0));
-}
+	sampler(0)
+{ }
 
 bool TexUnit::set_texture(const Texture *tex)
 {
@@ -26,27 +26,18 @@ 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)
+bool TexUnit::set_sampler(const Sampler *samp)
 {
-	if(i>=4)
-		throw out_of_range("TexUnit::set_texgen");
-	bool result = (texgen[i]!=gen);
-	texgen[i] = gen;
+	bool result = (samp!=sampler);
+	sampler = samp;
 	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,43 +46,47 @@ unsigned TexUnit::get_n_units()
 	if(count<0)
 	{
 		if(ARB_vertex_shader)
-			glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &count);
+			count = get_i(GL_MAX_COMBINED_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);
+		units.resize(n+1, TexUnit());
 		for(; i<units.size(); ++i)
 			units[i].index = i;
 	}
 
-	if(cur_unit!=&units[n] && (cur_unit || n))
-		glActiveTexture(GL_TEXTURE0+n);
-	cur_unit = &units[n];
-
 	return units[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