Mesa (master): mesa: Don' t bother updating ff texture state if we have a fragment shader.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Jan  8 09:56:24 2013 -0800

mesa: Don't bother updating ff texture state if we have a fragment shader.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

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

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 3adea54..a2541fc 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -618,7 +618,8 @@ update_texture_state( struct gl_context *ctx )
       if (enabledFragTargets)
          enabledFragUnits |= (1 << unit);
 
-      update_tex_combine(ctx, texUnit);
+      if (!fprog)
+         update_tex_combine(ctx, texUnit);
    }