X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=9b905120db6861d54204b172264d58c6f5340383;hb=922fac753e31d97fc88daa166e93e4c5572bd2ba;hp=fd0fe31423db1c6f76413f818f493eb661167b02;hpb=84bc56b96c21c831104a22e0cbd0f3b72ab5d8c3;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index fd0fe314..9b905120 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,6 +1,8 @@
-#define GL_GLEXT_PROTOTYPES
-#include <GL/gl.h>
-#include <GL/glext.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 "texunit.h"
 
 using namespace std;
@@ -8,24 +10,56 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+vector<TexUnit> TexUnit::units;
+TexUnit *TexUnit::cur_unit = 0;
+
 TexUnit::TexUnit():
 	texture(0)
 { }
 
 bool TexUnit::set_texture(const Texture *tex)
 {
-	bool result=(tex!=texture);
-	texture=tex;
+	bool result = (tex!=texture);
+	texture = tex;
 	return result;
 }
 
-TexUnit &TexUnit::activate(unsigned n)
+void TexUnit::bind()
 {
-	if(units.size()<=n)
-		units.resize(n+1);
+	if(cur_unit!=this && (cur_unit || index))
+		glActiveTexture(GL_TEXTURE0+index);
+	cur_unit = this;
+}
 
-	glActiveTextureARB(GL_TEXTURE0+n);
-	cur_unit=&units[n];
+unsigned TexUnit::get_n_units()
+{
+	static int count = -1;
+	if(count<0)
+	{
+		if(ARB_vertex_shader)
+			count = get_i(GL_MAX_TEXTURE_IMAGE_UNITS);
+		else if(ARB_multitexture)
+			count = get_i(GL_MAX_TEXTURE_UNITS);
+		else
+			count = 1;
+	}
+	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::get_unit");
+
+	if(units.size()<=n)
+	{
+		unsigned i = units.size();
+		units.resize(n+1, TexUnit());
+		for(; i<units.size(); ++i)
+			units[i].index = i;
+	}
 
 	return units[n];
 }
@@ -33,12 +67,17 @@ TexUnit &TexUnit::activate(unsigned n)
 TexUnit &TexUnit::current()
 {
 	if(!cur_unit)
-		return activate(0);
+		get_unit(0).bind();
 	return *cur_unit;
 }
 
-vector<TexUnit> TexUnit::units;
-TexUnit *TexUnit::cur_unit=0;
+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