X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=493a761133eaba7af8bafa85e45a9bf90c0827a2;hb=41368577ab4c4091e19d4e9cbbf8fbf2cfbdddca;hp=714b65027d1786f03865bdfd22ab7d3851440f2b;hpb=6924ea10c4111b11eab51f0e1aa5b4a6438da7d3;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 714b6502..493a7611 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -14,11 +14,8 @@ vector<TexUnit> TexUnit::units;
 TexUnit *TexUnit::cur_unit = 0;
 
 TexUnit::TexUnit():
-	texture(0),
-	texenv(0)
-{
-	fill(texgen, texgen+4, static_cast<const TexGen *>(0));
-}
+	texture(0)
+{ }
 
 bool TexUnit::set_texture(const Texture *tex)
 {
@@ -27,29 +24,6 @@ bool TexUnit::set_texture(const Texture *tex)
 	return result;
 }
 
-bool TexUnit::set_texenv(const TexEnv *env)
-{
-	bool result = (texenv!=env);
-	texenv = env;
-	return result;
-}
-
-bool TexUnit::set_texgen(unsigned i, const TexGen *gen)
-{
-	if(i>=4)
-		throw out_of_range("TexUnit::set_texgen");
-	bool result = (texgen[i]!=gen);
-	texgen[i] = gen;
-	return result;
-}
-
-const TexGen *TexUnit::get_texgen(unsigned i)
-{
-	if(i>=4)
-		throw out_of_range("TexUnit::get_texgen");
-	return texgen[i];
-}
-
 void TexUnit::bind()
 {
 	if(cur_unit!=this && (cur_unit || index))
@@ -63,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
@@ -82,7 +56,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;
 	}
@@ -105,13 +79,5 @@ TexUnit *TexUnit::find_unit(const Texture *tex)
 	return 0;
 }
 
-TexUnit *TexUnit::find_unit(const TexEnv *env)
-{
-	for(vector<TexUnit>::iterator i=units.begin(); i!=units.end(); ++i)
-		if(i->texenv==env)
-			return &*i;
-	return 0;
-}
-
 } // namespace GL
 } // namespace Msp