Add a Texturing class to encapsulate the state of multiple texturing units

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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index a542796548f0ae120bc9037b81bf0e2e3071c0fd..4d5ff81a297dc9f4d3b1f5dfb564111a3257ecbb 100644 (file)
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -41,19 +41,21 @@ unsigned TexUnit::get_n_units()
 {
        static int count = -1;
        if(count<0)
-               // XXX Should use GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS since GL 2.0
-               glGetIntegerv(GL_MAX_TEXTURE_UNITS, &count);
+       {
+               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>0)
-       {
-               static RequireVersion _ver(1, 3);
-               if(n>=get_n_units())
-                       throw InvalidParameterValue("Invalid texture unit number");
-       }
+       if(n>=get_n_units())
+               throw InvalidParameterValue("Invalid texture unit number");
 
        if(units.size()<=n)
                units.resize(n+1);