X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=493a761133eaba7af8bafa85e45a9bf90c0827a2;hb=a40fc85277dba5c34402a0e703d038efd30cc57b;hp=74a23246b368ac6ad3b6b3d69765c5f6d4bbd82e;hpb=e1672476c5a258ff67fe1fcb47dd9a40b89169cb;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 74a23246..493a7611 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,7 +1,6 @@
 #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"
@@ -15,7 +14,6 @@ vector<TexUnit> TexUnit::units;
 TexUnit *TexUnit::cur_unit = 0;
 
 TexUnit::TexUnit():
-	legacy(false),
 	texture(0)
 { }
 
@@ -39,7 +37,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
@@ -48,19 +46,6 @@ 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)
@@ -71,13 +56,9 @@ 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];