Mesa (master): i965/fs: Only set brw_wm_prog_key data for samplers used by the WM.

[Kenneth Graunke]

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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Dec  8 12:15:59 2011 -0800

i965/fs: Only set brw_wm_prog_key data for samplers used by the WM.

This should avoid state-dependent FS recompiles when samplers that are
only used by the VS change.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/drivers/dri/i965/brw_wm.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index f23edfa..cad0af8 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -412,6 +412,7 @@ static void brw_wm_populate_key( struct brw_context *brw,
    /* BRW_NEW_FRAGMENT_PROGRAM */
    const struct brw_fragment_program *fp = 
       (struct brw_fragment_program *)brw->fragment_program;
+   const struct gl_program *prog = (struct gl_program *) brw->fragment_program;
    GLuint lookup = 0;
    GLuint line_aa;
    GLuint i;
@@ -487,7 +488,8 @@ static void brw_wm_populate_key( struct brw_context *brw,
 
    /* _NEW_TEXTURE */
    for (i = 0; i < BRW_MAX_TEX_UNIT; i++) {
-      brw_populate_sampler_prog_key_data(ctx, &key->tex, i);
+      if (prog->TexturesUsed[i])
+	 brw_populate_sampler_prog_key_data(ctx, &key->tex, i);
    }
 
    /* _NEW_BUFFERS */