Always bind textures in a specific texture unit

[libs/gl.git] / source / texture.cpp

diff --git a/source/texture.cpp b/source/texture.cpp
index aeea2818debfaaf03345da191b95d7cf39053dc9..f6b5f8e4be06f6e0706de648d9a8f30da78bff56 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -64,7 +64,7 @@ Texture::~Texture()
 
 void Texture::update_parameter(int mask) const
 {
-       if(current()==this)
+       if(TexUnit::current().get_texture()==this)
        {
                if(mask&MIN_FILTER)
                        glTexParameteri(target, GL_TEXTURE_MIN_FILTER, min_filter);
@@ -162,18 +162,18 @@ void Texture::set_compare_func(Predicate f)
        update_parameter(COMPARE_FUNC);
 }
 
-void Texture::bind() const
+void Texture::bind_to(unsigned i) const
 {
-       const Texture *cur = TexUnit::current().get_texture();
-       if(cur!=this)
+       TexUnit &unit = TexUnit::get_unit(i);
+       const Texture *cur = unit.get_texture();
+       if(unit.set_texture(this))
        {
+               unit.bind();
                if(cur && cur->target!=target)
                        glDisable(cur->target);
                if(!cur || cur->target!=target)
                        glEnable(target);
-
                glBindTexture(target, id);
-               TexUnit::current().set_texture(this);
 
                if(dirty_params)
                {
@@ -183,32 +183,21 @@ void Texture::bind() const
        }
 }
 
-void Texture::bind_to(unsigned i) const
-{
-       TexUnit::activate(i);
-       bind();
-}
-
-const Texture *Texture::current()
+const Texture *Texture::current(unsigned i)
 {
-       return TexUnit::current().get_texture();
-}
-
-void Texture::unbind()
-{
-       const Texture *cur = TexUnit::current().get_texture();
-       if(!cur)
-               return;
-
-       glBindTexture(cur->target, 0);
-       glDisable(cur->target);
-       TexUnit::current().set_texture(0);
+       return TexUnit::get_unit(i).get_texture();
 }
 
 void Texture::unbind_from(unsigned i)
 {
-       TexUnit::activate(i);
-       unbind();
+       TexUnit &unit = TexUnit::get_unit(i);
+       const Texture *cur = unit.get_texture();
+       if(unit.set_texture(0))
+       {
+               unit.bind();
+               glBindTexture(cur->target, 0);
+               glDisable(cur->target);
+       }
 }