svga: replace sampler assertion with conditional
authorBrian Paul <brianp@vmware.com>
Thu, 3 Apr 2014 14:45:42 +0000 (08:45 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 8 Apr 2014 14:45:18 +0000 (08:45 -0600)
commit9bb2ec6fd1464d92f44b8aa693616edda9724312
treee002fe2a93a086bbd0ca950f3eb9fbf7edf641cb
parent4ddf51db6af36736d5d42c1043eeea86e47459ce
svga: replace sampler assertion with conditional

For TEX instructions, the set of samplers and sampler views should
be consistent.  The XA state tracker sometimes passes an inconsistent
set of samplers and sampler views.  Rather than assert and die, issue
a warning.

v2: add debugging code to detect inconsistent state.
v3: also check for null sampler in svga_state_tss.c

Cc: "10.0" "10.1" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
src/gallium/drivers/svga/svga_state_fs.c
src/gallium/drivers/svga/svga_state_tss.c