X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture.cpp;h=f095fe98aadcb99500ecad562275027453d14dcf;hp=1d2ece8074410ded753c621f4c4dd43418e2694d;hb=7a2427020ec6ead73258aeb326dfb7e0121520f9;hpb=ed2d1c8c5ac065751a7887b178b4499007c1ffe4

diff --git a/source/texture.cpp b/source/texture.cpp
index 1d2ece80..f095fe98 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -63,6 +63,7 @@ Texture::Texture(GLenum t, ResourceManager *m):
 	ifmt(RGB),
 	min_filter(NEAREST_MIPMAP_LINEAR),
 	mag_filter(LINEAR),
+	max_anisotropy(1.0f),
 	wrap_s(REPEAT),
 	wrap_t(REPEAT),
 	wrap_r(REPEAT),
@@ -220,7 +221,8 @@ void Texture::set_max_anisotropy(float a)
 	else if(a>1.0f)
 		static Require _req(EXT_texture_filter_anisotropic);
 	max_anisotropy = a;
-	update_parameter(MAX_ANISOTROPY);
+	if(EXT_texture_filter_anisotropic)
+		update_parameter(MAX_ANISOTROPY);
 }
 
 void Texture::set_wrap(TextureWrap w)
@@ -319,15 +321,20 @@ void Texture::bind_to(unsigned i) const
 		if(manager)
 			manager->resource_used(*this);
 
-		unit.bind();
-		if(unit.supports_legacy())
+		if(ARB_direct_state_access && !unit.supports_legacy())
+			glBindTextureUnit(i, id);
+		else
 		{
-			if(old && old->target!=target)
-				glDisable(old->target);
-			if(!old || old->target!=target)
-				glEnable(target);
+			unit.bind();
+			if(unit.supports_legacy())
+			{
+				if(old && old->target!=target)
+					glDisable(old->target);
+				if((!old || old->target!=target))
+					glEnable(target);
+			}
+			glBindTexture(target, id);
 		}
-		glBindTexture(target, id);
 
 		if(dirty_params)
 		{
@@ -348,10 +355,15 @@ void Texture::unbind_from(unsigned i)
 	const Texture *cur = unit.get_texture();
 	if(unit.set_texture(0))
 	{
-		unit.bind();
-		glBindTexture(cur->target, 0);
-		if(unit.supports_legacy())
-			glDisable(cur->target);
+		if(ARB_direct_state_access && !unit.supports_legacy())
+			glBindTextureUnit(i, 0);
+		else
+		{
+			unit.bind();
+			glBindTexture(cur->target, 0);
+			if(unit.supports_legacy())
+				glDisable(cur->target);
+		}
 	}
 }