Bind ProgramData to a Program upon construction

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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 1155fa96286be0ab199280e61ea909115545df30..4d5ff81a297dc9f4d3b1f5dfb564111a3257ecbb 100644 (file)
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -15,10 +15,13 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+vector<TexUnit> TexUnit::units;
+TexUnit *TexUnit::cur_unit = 0;
+
 TexUnit::TexUnit():
-       texture(0)
-{
-}
+       texture(0),
+       texenv(0)
+{ }
 
 bool TexUnit::set_texture(const Texture *tex)
 {
@@ -34,16 +37,31 @@ bool TexUnit::set_texenv(const TexEnv *env)
        return result;
 }
 
+unsigned TexUnit::get_n_units()
+{
+       static int count = -1;
+       if(count<0)
+       {
+               if(is_version_at_least(2, 0) || is_supported("ARB_vertex_shader"))
+                       glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &count);
+               else if(is_version_at_least(1, 3))
+                       glGetIntegerv(GL_MAX_TEXTURE_UNITS, &count);
+               else
+                       count = 1;
+       }
+       return count;
+}
+
 TexUnit &TexUnit::activate(unsigned n)
 {
+       if(n>=get_n_units())
+               throw InvalidParameterValue("Invalid texture unit number");
+
        if(units.size()<=n)
                units.resize(n+1);
 
        if(cur_unit!=&units[n] && (cur_unit || n))
-       {
-               static RequireVersion _ver(1, 3);
                glActiveTexture(GL_TEXTURE0+n);
-       }
        cur_unit = &units[n];
 
        return units[n];
@@ -56,8 +74,5 @@ TexUnit &TexUnit::current()
        return *cur_unit;
 }
 
-vector<TexUnit> TexUnit::units;
-TexUnit *TexUnit::cur_unit = 0;
-
 } // namespace GL
 } // namespace Msp