Looks good. Reviewed-by: Neha Bhende<bhen...@vmware.com> ________________________________ From: Brian Paul <bri...@vmware.com> Sent: Thursday, December 28, 2017 8:19:24 AM To: mesa-dev@lists.freedesktop.org Cc: Charmaine Lee; Neha Bhende Subject: [PATCH] svga: check for null fs pointer in update_samplers()
This can happen when there's no active fragment shader, such as when using transform feedback. This wasn't hit by any Piglit test but is hit by Daniel Rákos' Nature demo. VMware bug 2026189. --- src/gallium/drivers/svga/svga_state_sampler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/svga/svga_state_sampler.c b/src/gallium/drivers/svga/svga_state_sampler.c index 9bd0d53..11f36e3 100644 --- a/src/gallium/drivers/svga/svga_state_sampler.c +++ b/src/gallium/drivers/svga/svga_state_sampler.c @@ -399,7 +399,7 @@ update_samplers(struct svga_context *svga, unsigned dirty ) * for this texture unit, don't enable shadow compare in * the texture sampler state. */ - if (fs->fs_shadow_compare_units & (1 << i)) { + if (fs && (fs->fs_shadow_compare_units & (1 << i))) { fs_shadow = true; } } -- 1.9.1
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev