X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexunit.cpp;h=31c90777aad10eccd5a4e9d110de2a0846809f26;hp=9b905120db6861d54204b172264d58c6f5340383;hb=bb162b9edd4b8c0e9faeed75da4148f5b9735450;hpb=f1b12c992db974c679d85ae6ec22cd318199d0d5

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 9b905120..31c90777 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,6 +1,7 @@
 #include <stdexcept>
 #include <msp/gl/extensions/arb_multitexture.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
+#include <msp/gl/extensions/msp_legacy_features.h>
 #include "gl.h"
 #include "misc.h"
 #include "texunit.h"
@@ -14,6 +15,7 @@ vector<TexUnit> TexUnit::units;
 TexUnit *TexUnit::cur_unit = 0;
 
 TexUnit::TexUnit():
+	legacy(false),
 	texture(0)
 { }
 
@@ -37,7 +39,7 @@ unsigned TexUnit::get_n_units()
 	if(count<0)
 	{
 		if(ARB_vertex_shader)
-			count = get_i(GL_MAX_TEXTURE_IMAGE_UNITS);
+			count = get_i(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS);
 		else if(ARB_multitexture)
 			count = get_i(GL_MAX_TEXTURE_UNITS);
 		else
@@ -46,6 +48,19 @@ unsigned TexUnit::get_n_units()
 	return count;
 }
 
+unsigned TexUnit::get_n_legacy_units()
+{
+	static int count = -1;
+	if(count<0)
+	{
+		if(MSP_legacy_features)
+			count = get_i(GL_MAX_TEXTURE_UNITS);
+		else
+			count = 0;
+	}
+	return count;
+}
+
 TexUnit &TexUnit::get_unit(unsigned n)
 {
 	if(n>0)
@@ -56,9 +71,13 @@ TexUnit &TexUnit::get_unit(unsigned n)
 	if(units.size()<=n)
 	{
 		unsigned i = units.size();
+		unsigned n_legacy = get_n_legacy_units();
 		units.resize(n+1, TexUnit());
 		for(; i<units.size(); ++i)
+		{
 			units[i].index = i;
+			units[i].legacy = (i<n_legacy);
+		}
 	}
 
 	return units[n];