Always bind textures in a specific texture unit

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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index b19e791727c0e9f6d006c7a51eb58d3b0d634ed2..982e524e0189fa74a10181c9a2ff7f7014e8746e 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,10 +45,17 @@ 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];
 }
 
+void TexUnit::bind()
+{
+       if(cur_unit!=this && (cur_unit || index))
+               glActiveTexture(GL_TEXTURE0+index);
+       cur_unit = this;
+}
+
 unsigned TexUnit::get_n_units()
 {
        static int count = -1;
@@ -64,19 +71,20 @@ unsigned TexUnit::get_n_units()
        return count;
 }
 
-TexUnit &TexUnit::activate(unsigned n)
+TexUnit &TexUnit::get_unit(unsigned n)
 {
        if(n>0)
                static Require _req(ARB_multitexture);
        if(n>=get_n_units())
-               throw out_of_range("TexUnit::activate");
+               throw out_of_range("TexUnit::get_unit");
 
        if(units.size()<=n)
+       {
+               unsigned i = units.size();
                units.resize(n+1);
-
-       if(cur_unit!=&units[n] && (cur_unit || n))
-               glActiveTexture(GL_TEXTURE0+n);
-       cur_unit = &units[n];
+               for(; i<units.size(); ++i)
+                       units[i].index = i;
+       }
 
        return units[n];
 }
@@ -84,7 +92,7 @@ TexUnit &TexUnit::activate(unsigned n)
 TexUnit &TexUnit::current()
 {
        if(!cur_unit)
-               return activate(0);
+               get_unit(0).bind();
        return *cur_unit;
 }