From: Brian Paul <brianp@vmware.com>
Date: Thu, 28 Dec 2017 16:16:44 +0000 (-0700)
Subject: svga: check for null fs pointer in update_samplers()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e0eaeef3e7b5671a231644373c722ebd09d6765d;p=mesa.git

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.

Reviewed-by: Charmaine Lee <charmainel@vmware.com>
---

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;
             }
          }