X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexunit.cpp;h=9277c27704ebd8347c3c6a782fc1b6ff05fc8658;hp=0a5f9bf3a4c4a971489b59d5134204c5c66caa92;hb=332352298ef41b8ac3a4c57b467dd146c0b05e0b;hpb=b250a711295f5ba00114f11a5b1c855eebe08d26

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 0a5f9bf3..9277c277 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,7 +1,9 @@
 #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 <msp/gl/extensions/msp_legacy_features.h>
 #include "gl.h"
+#include "misc.h"
 #include "texunit.h"
 
 using namespace std;
@@ -13,40 +15,25 @@ vector<TexUnit> TexUnit::units;
 TexUnit *TexUnit::cur_unit = 0;
 
 TexUnit::TexUnit():
+	legacy(false),
 	texture(0),
-	texenv(0)
-{
-	fill(texgen, texgen+4, static_cast<const TexGen *>(0));
-}
+	tex_legacy(false)
+{ }
 
-bool TexUnit::set_texture(const Texture *tex)
+bool TexUnit::set_texture(const Texture *tex, bool lgc)
 {
-	bool result = (tex!=texture);
+	lgc = (lgc && legacy && tex);
+	bool result = (tex!=texture || lgc!=tex_legacy);
 	texture = tex;
+	tex_legacy = lgc;
 	return result;
 }
 
-bool TexUnit::set_texenv(const TexEnv *env)
+void TexUnit::bind()
 {
-	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)
-{
-	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 +42,46 @@ 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)
+unsigned TexUnit::get_n_legacy_units()
+{
+	static int count = -1;
+	if(count<0)
+	{
+		if(MSP_legacy_features)
+			count = get_i(GL_MAX_TEXTURE_UNITS);
+		else
+			count = 0;
+	}
+	return count;
+}
+
+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();
+		unsigned n_legacy = get_n_legacy_units();
+		units.resize(n+1, TexUnit());
+		for(; i<units.size(); ++i)
+		{
+			units[i].index = i;
+			units[i].legacy = (i<n_legacy);
+		}
+	}
 
 	return units[n];
 }
@@ -84,9 +89,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