Do not store generated files in the repository

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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index d581598a6c190e2caf46c59d11140d403c30e79b..aa52aed4525a1c398aa2cf6f08793388074a723f 100644 (file)
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,8 +1,8 @@
 #include <stdexcept>
-#include "extension.h"
+#include <msp/gl/extensions/arb_multitexture.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
 #include "gl.h"
 #include "texunit.h"
-#include "version_1_3.h"
 
 using namespace std;
 
@@ -36,7 +36,7 @@ bool TexUnit::set_texenv(const TexEnv *env)
 bool TexUnit::set_texgen(unsigned i, const TexGen *gen)
 {
        if(i>=4)
-               throw invalid_argument("TexUnit::set_texgen");
+               throw out_of_range("TexUnit::set_texgen");
        bool result = (texgen[i]!=gen);
        texgen[i] = gen;
        return result;
@@ -45,7 +45,7 @@ bool TexUnit::set_texgen(unsigned i, const TexGen *gen)
 const TexGen *TexUnit::get_texgen(unsigned i)
 {
        if(i>=4)
-               throw invalid_argument("TexUnit::get_texgen");
+               throw out_of_range("TexUnit::get_texgen");
        return texgen[i];
 }
 
@@ -54,9 +54,9 @@ unsigned TexUnit::get_n_units()
        static int count = -1;
        if(count<0)
        {
-               if(is_version_at_least(2, 0) || is_supported("ARB_vertex_shader"))
+               if(ARB_vertex_shader)
                        glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &count);
-               else if(is_version_at_least(1, 3))
+               else if(ARB_multitexture)
                        glGetIntegerv(GL_MAX_TEXTURE_UNITS, &count);
                else
                        count = 1;
@@ -66,6 +66,8 @@ unsigned TexUnit::get_n_units()
 
 TexUnit &TexUnit::activate(unsigned n)
 {
+       if(n>0)
+               static Require _req(ARB_multitexture);
        if(n>=get_n_units())
                throw out_of_range("TexUnit::activate");