Rework ProgramData to do less unnecessary work

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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 982e524e0189fa74a10181c9a2ff7f7014e8746e..fd36a4f15b5e77b7455af08ed4133f6e578c8c44 100644 (file)
--- 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;
        }
@@ -81,7 +82,7 @@ TexUnit &TexUnit::get_unit(unsigned n)
        if(units.size()<=n)
        {
                unsigned i = units.size();
-               units.resize(n+1);
+               units.resize(n+1, TexUnit());
                for(; i<units.size(); ++i)
                        units[i].index = i;
        }
@@ -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