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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 74a23246..9277c277 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -16,13 +16,16 @@ TexUnit *TexUnit::cur_unit = 0;
 
 TexUnit::TexUnit():
 	legacy(false),
-	texture(0)
+	texture(0),
+	tex_legacy(false)
 { }
 
-bool TexUnit::set_texture(const Texture *tex)
+bool TexUnit::set_texture(const Texture *tex, bool lgc)
 {
-	bool result = (tex!=texture);
+	lgc = (lgc && legacy && tex);
+	bool result = (tex!=texture || lgc!=tex_legacy);
 	texture = tex;
+	tex_legacy = lgc;
 	return result;
 }
 
@@ -39,7 +42,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