From e0eaeef3e7b5671a231644373c722ebd09d6765d Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 28 Dec 2017 09:16:44 -0700 Subject: [PATCH] svga: check for null fs pointer in update_samplers() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. Reviewed-by: Charmaine Lee --- 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 9bd0d5303bd..11f36e3553b 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; } } -- 2.30.2