gallium: fix the shader-rebind test in softpipe, as was done for the draw module.
authorBrian Paul <brian.paul@tungstengraphics.com>
Wed, 15 Oct 2008 17:59:34 +0000 (11:59 -0600)
committerBrian Paul <brian.paul@tungstengraphics.com>
Wed, 15 Oct 2008 18:00:48 +0000 (12:00 -0600)
src/gallium/drivers/softpipe/sp_fs_exec.c

index 89429c100e1971fbba8e0989217f7b086490561d..6280f0701d7a27621e62a060c69f11cf6bc90050 100644 (file)
@@ -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;
    }
 }