Mesa (gallium-0.2): gallium: fix the shader-rebind test in softpipe, as was done for the draw module.
Brian Paul
brianp at kemper.freedesktop.org
Wed Oct 15 18:03:12 UTC 2008
Module: Mesa
Branch: gallium-0.2
Commit: 5f76a77b319b4b66001dea4bcfccd0484aed82f5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f76a77b319b4b66001dea4bcfccd0484aed82f5
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date: Wed Oct 15 11:59:34 2008 -0600
gallium: fix the shader-rebind test in softpipe, as was done for the draw module.
---
src/gallium/drivers/softpipe/sp_fs_exec.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/softpipe/sp_fs_exec.c b/src/gallium/drivers/softpipe/sp_fs_exec.c
index 89429c1..6280f07 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;
}
}
More information about the mesa-commit
mailing list