summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-10-15 11:59:34 -0600
committerBrian Paul <[email protected]>2008-10-15 12:00:48 -0600
commit5f76a77b319b4b66001dea4bcfccd0484aed82f5 (patch)
treedd24f890d560d1fee2cbe0bdde7b2deb325bf2c5 /src/gallium/drivers
parent05a8f203cdea768466e5faf1dec4155e1e945c78 (diff)
gallium: fix the shader-rebind test in softpipe, as was done for the draw module.
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/softpipe/sp_fs_exec.c5
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 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;
}
}