Make TexUnits aware of their incides

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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index b19e791727c0e9f6d006c7a51eb58d3b0d634ed2..2b3418fee43cb4fe7a7f0276ad2f6ffdb2d602ea 100644 (file)
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,6 +1,6 @@
 #include <stdexcept>
-#include "arb_multitexture.h"
-#include "arb_vertex_shader.h"
+#include <msp/gl/extensions/arb_multitexture.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
 #include "gl.h"
 #include "texunit.h"
 
@@ -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];
 }
 
@@ -72,7 +72,12 @@ TexUnit &TexUnit::activate(unsigned n)
                throw out_of_range("TexUnit::activate");
 
        if(units.size()<=n)
+       {
+               unsigned i = units.size();
                units.resize(n+1);
+               for(; i<units.size(); ++i)
+                       units[i].index = i;
+       }
 
        if(cur_unit!=&units[n] && (cur_unit || n))
                glActiveTexture(GL_TEXTURE0+n);