Better state tracking for bound objects

[libs/gl.git] / source / texunit.cpp

diff --git a/source/texunit.cpp b/source/texunit.cpp
index aa52aed4525a1c398aa2cf6f08793388074a723f..1129a0365617816a58ee1f0ff884cbd2f1e0ef59 100644 (file)
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -49,6 +49,13 @@ const TexGen *TexUnit::get_texgen(unsigned i)
        return texgen[i];
 }
 
+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;
@@ -64,19 +71,20 @@ unsigned TexUnit::get_n_units()
        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);
-
-       if(cur_unit!=&units[n] && (cur_unit || n))
-               glActiveTexture(GL_TEXTURE0+n);
-       cur_unit = &units[n];
+               for(; i<units.size(); ++i)
+                       units[i].index = i;
+       }
 
        return units[n];
 }
@@ -84,9 +92,25 @@ 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;
+}
+
+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