Make TexUnits aware of their incides

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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 0a5f9bf3a4c4a971489b59d5134204c5c66caa92..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"
 
@@ -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);