image(img, srgb);
}
-void Texture::bind_to(unsigned i) const
+void Texture::bind_to(unsigned i, bool legacy) const
{
if(!id)
{
}
}
+ legacy = (legacy && is_legacy_target(target));
+
TexUnit &unit = TexUnit::get_unit(i);
const Texture *old = unit.get_texture();
- if(unit.set_texture(this))
+ bool old_legacy = unit.get_texture_legacy();
+ if(unit.set_texture(this, legacy))
{
if(manager)
manager->resource_used(*this);
- unit.bind();
- if(unit.supports_legacy())
+ if(ARB_direct_state_access && !old_legacy && (!unit.supports_legacy() || !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 && old_legacy)
+ glDisable(old->target);
+ if((!old || old->target!=target) && legacy)
+ glEnable(target);
+ }
+ glBindTexture(target, id);
}
- glBindTexture(target, id);
if(dirty_params)
{
{
TexUnit &unit = TexUnit::get_unit(i);
const Texture *cur = unit.get_texture();
+ bool legacy = unit.get_texture_legacy();
if(unit.set_texture(0))
{
- unit.bind();
- glBindTexture(cur->target, 0);
- if(unit.supports_legacy())
- glDisable(cur->target);
+ if(ARB_direct_state_access && !legacy)
+ glBindTextureUnit(i, 0);
+ else
+ {
+ unit.bind();
+ glBindTexture(cur->target, 0);
+ if(unit.supports_legacy() && legacy)
+ glDisable(cur->target);
+ }
}
}
+bool Texture::is_legacy_target(GLenum target)
+{
+ return target<GL_TEXTURE_1D_ARRAY;
+}
+
Texture::Loader::Loader(Texture &t):
DataFile::CollectionObjectLoader<Texture>(t, 0)