X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture.cpp;h=820dd10fd90318c64278ae9b0aed66cf227d8743;hp=1b7bdc2297ec3a1be84d95fdcd091b55b59bae20;hb=7af837734a28a14b3e24a421187d12ecd16572d0;hpb=0f890ce60a560ba2ccc0719229be304bb597d919

diff --git a/source/texture.cpp b/source/texture.cpp
index 1b7bdc22..820dd10f 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -314,6 +314,8 @@ void Texture::bind_to(unsigned i, bool legacy) const
 		}
 	}
 
+	legacy = (legacy && is_legacy_target(target));
+
 	TexUnit &unit = TexUnit::get_unit(i);
 	const Texture *old = unit.get_texture();
 	bool old_legacy = unit.get_texture_legacy();
@@ -369,6 +371,11 @@ void Texture::unbind_from(unsigned i)
 	}
 }
 
+bool Texture::is_legacy_target(GLenum target)
+{
+	return target<GL_TEXTURE_1D_ARRAY;
+}
+
 
 Texture::Loader::Loader(Texture &t):
 	DataFile::CollectionObjectLoader<Texture>(t, 0)