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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index a5427965..0659d615 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,14 +1,10 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "extension.h"
+#include <stdexcept>
+#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"
-#include "version_1_3.h"
 
 using namespace std;
 
@@ -20,7 +16,7 @@ TexUnit *TexUnit::cur_unit = 0;
 
 TexUnit::TexUnit():
 	texture(0),
-	texenv(0)
+	sampler(0)
 { }
 
 bool TexUnit::set_texture(const Texture *tex)
@@ -30,37 +26,49 @@ bool TexUnit::set_texture(const Texture *tex)
 	return result;
 }
 
-bool TexUnit::set_texenv(const TexEnv *env)
+bool TexUnit::set_sampler(const Sampler *samp)
 {
-	bool result = (texenv!=env);
-	texenv = env;
+	bool result = (samp!=sampler);
+	sampler = samp;
 	return result;
 }
 
+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)
-		// XXX Should use GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS since GL 2.0
-		glGetIntegerv(GL_MAX_TEXTURE_UNITS, &count);
+	{
+		if(ARB_vertex_shader)
+			count = get_i(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS);
+		else if(ARB_multitexture)
+			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 RequireVersion _ver(1, 3);
-		if(n>=get_n_units())
-			throw InvalidParameterValue("Invalid texture unit number");
-	}
+		static Require _req(ARB_multitexture);
+	if(n>=get_n_units())
+		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];
 }
@@ -68,9 +76,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