X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=fd36a4f15b5e77b7455af08ed4133f6e578c8c44;hb=00d3ccedefb1a5efb3d2d4625a2b68446703fbab;hp=1129a0365617816a58ee1f0ff884cbd2f1e0ef59;hpb=126161d1d44ab9503bc747d24a07b7b9d15e527a;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 1129a036..fd36a4f1 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -2,6 +2,7 @@
 #include <msp/gl/extensions/arb_multitexture.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
 #include "gl.h"
+#include "misc.h"
 #include "texunit.h"
 
 using namespace std;
@@ -62,9 +63,9 @@ unsigned TexUnit::get_n_units()
 	if(count<0)
 	{
 		if(ARB_vertex_shader)
-			glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &count);
+			count = get_i(GL_MAX_TEXTURE_IMAGE_UNITS);
 		else if(ARB_multitexture)
-			glGetIntegerv(GL_MAX_TEXTURE_UNITS, &count);
+			count = get_i(GL_MAX_TEXTURE_UNITS);
 		else
 			count = 1;
 	}
@@ -81,7 +82,7 @@ TexUnit &TexUnit::get_unit(unsigned n)
 	if(units.size()<=n)
 	{
 		unsigned i = units.size();
-		units.resize(n+1);
+		units.resize(n+1, TexUnit());
 		for(; i<units.size(); ++i)
 			units[i].index = i;
 	}