From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 15 Oct 2008 17:59:34 +0000 (-0600)
Subject: gallium: fix the shader-rebind test in softpipe, as was done for the draw module.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5f76a77b319b4b66001dea4bcfccd0484aed82f5;p=mesa.git

gallium: fix the shader-rebind test in softpipe, as was done for the draw module.
---

diff --git a/src/gallium/drivers/softpipe/sp_fs_exec.c b/src/gallium/drivers/softpipe/sp_fs_exec.c
index 89429c100e1..6280f0701d7 100644
--- a/src/gallium/drivers/softpipe/sp_fs_exec.c
+++ b/src/gallium/drivers/softpipe/sp_fs_exec.c
@@ -42,7 +42,6 @@
 struct sp_exec_fragment_shader
 {
    struct sp_fragment_shader base;
-   const struct tgsi_token *machine_tokens;
 };
 
 
@@ -102,13 +101,11 @@ exec_prepare( const struct sp_fragment_shader *base,
     * Bind tokens/shader to the interpreter's machine state.
     * Avoid redundant binding.
     */
-   /* XXX revisit this */
-   if (1 /* spefs->machine_tokens != base->shader.tokens*/) {
+   if (machine->Tokens != base->shader.tokens) {
       tgsi_exec_machine_bind_shader( machine,
                                      base->shader.tokens,
                                      PIPE_MAX_SAMPLERS,
                                      samplers );
-      spefs->machine_tokens = base->shader.tokens;
    }
 }