softpipe: fix softpipe_delete_fs_state() failed assertion
authorBrian Paul <brianp@vmware.com>
Fri, 10 Aug 2012 18:16:10 +0000 (12:16 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 10 Aug 2012 19:27:04 +0000 (13:27 -0600)
commit16c702ef3b9cff320c2adbfa853e00088adbf689
tree4050aab7a74db2e53afd679f4408bd236631183b
parent3487b93cc4b8bea44f966a4f5cfd29b26dbbcff2
softpipe: fix softpipe_delete_fs_state() failed assertion

The var!=softpipe->fs_variant assertion was failing because we weren't
nulling the softpipe->fs_variant pointer when binding a new shader.
Since softpipe->fs_variant depends on the current fs, it's of no use
when a new FS is bound.

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=53318

Note: This is a candidate for the 8.0 branch.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
src/gallium/drivers/softpipe/sp_state_shader.c