Better state tracking for bound objects

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

diff --git a/source/texenv.cpp b/source/texenv.cpp
index ff9ea197b982cdb6a092137f14c5c8f8709e2d68..51adf9fb4aee45f1aa40e93effbad084e3c3b4d4 100644 (file)
--- a/source/texenv.cpp
+++ b/source/texenv.cpp
@@ -15,18 +15,33 @@ const TexEnv &TexEnv::default_object()
        return obj;
 }
 
+void TexEnv::update_parameter(int mask) const
+{
+       if(TexUnit::current().get_texenv()!=this)
+       {
+               TexUnit *unit = TexUnit::find_unit(this);
+               if(!unit)
+                       return;
+
+               unit->bind();
+       }
+
+       if(mask&MODE)
+               glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, mode);
+       if(mask&COLOR)
+               glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &color.r);
+}
+
 void TexEnv::set_mode(TexEnvMode m)
 {
        mode = m;
-       if(TexUnit::current().get_texenv()==this)
-               glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, mode);
+       update_parameter(MODE);
 }
 
 void TexEnv::set_color(const Color &c)
 {
        color = c;
-       if(TexUnit::current().get_texenv()==this)
-               glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &color.r);
+       update_parameter(COLOR);
 }
 
 void TexEnv::bind_to(unsigned i) const
@@ -35,8 +50,7 @@ void TexEnv::bind_to(unsigned i) const
        if(unit.set_texenv(this))
        {
                unit.bind();
-               glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, mode);
-               glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &color.r);
+               update_parameter(-1);
        }
 }