Mesa (master): mesa: move call to update_texture_compare_function()

Brian Paul brianp at kemper.freedesktop.org
Mon Mar 2 22:22:48 UTC 2009


Module: Mesa
Branch: master
Commit: 6c75d7b4e6b04ce9e5e8d188a143cb7a1670c953
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c75d7b4e6b04ce9e5e8d188a143cb7a1670c953

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Mar  2 15:21:50 2009 -0700

mesa: move call to update_texture_compare_function()

Another conditional can be avoided.

---

 src/mesa/main/texstate.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index b29721e..2b07da8 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -576,9 +576,6 @@ update_texture_state( GLcontext *ctx )
          }
       }
 
-      if (texUnit->_Current)
-         update_texture_compare_function(ctx, texUnit->_Current);
-
       if (!texUnit->_ReallyEnabled) {
          _mesa_reference_texobj(&texUnit->_Current, NULL);
          continue;
@@ -592,6 +589,7 @@ update_texture_state( GLcontext *ctx )
          enabledFragUnits |= (1 << unit);
 
       update_tex_combine(ctx, texUnit);
+      update_texture_compare_function(ctx, texUnit->_Current);
    }
 
 




More information about the mesa-commit mailing list