Bind ProgramData to a Program upon construction

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

diff --git a/source/texture.cpp b/source/texture.cpp
index eca0334795ad838c109bad4ed0aa06cf3e06577e..52ad074281d30b945f0b2f328883f25ef06704da 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -60,7 +60,7 @@ Texture::~Texture()
 
 void Texture::update_parameter(int mask) const
 {
-       if(TexUnit::current().get_texture()==this)
+       if(current()==this)
        {
                if(mask&MIN_FILTER)
                        glTexParameteri(target, GL_TEXTURE_MIN_FILTER, min_filter);
@@ -76,7 +76,7 @@ void Texture::update_parameter(int mask) const
                        glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, gen_mipmap);
                if(mask&COMPARE)
                        glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
-               if(mask&cmp_func)
+               if(mask&COMPARE_FUNC)
                        glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func);
        }
        else