From: Eric Anholt <eric@anholt.net>
Date: Tue, 8 Jan 2013 17:56:24 +0000 (-0800)
Subject: mesa: Don't bother updating ff texture state if we have a fragment shader.
X-Git-Tag: android-x86-4.4-r1~1755
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=078727d41c1f1578704c830fce062bd0538802ab;p=android-x86%2Fexternal-mesa.git

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

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

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 3adea542f57..a2541fc9f1c 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);
    }