X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Ftexunit.cpp;h=714b65027d1786f03865bdfd22ab7d3851440f2b;hb=47af19a447e6c13257ca2d0aef606ea45f8a0d98;hp=982e524e0189fa74a10181c9a2ff7f7014e8746e;hpb=6fd9b09f47ff6a07bd5ca7f9e8887db3486bfcb1;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 982e524e..714b6502 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;
@@ -62,9 +63,9 @@ 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;
 	}
@@ -96,5 +97,21 @@ TexUnit &TexUnit::current()
 	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;
+}
+
+TexUnit *TexUnit::find_unit(const TexEnv *env)
+{
+	for(vector<TexUnit>::iterator i=units.begin(); i!=units.end(); ++i)
+		if(i->texenv==env)
+			return &*i;
+	return 0;
+}
+
 } // namespace GL
 } // namespace Msp