Module: Mesa
Branch: master
Commit: e0eaeef3e7b5671a231644373c722ebd09d6765d
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e0eaeef3e7b5671a231644373c722ebd09d6765d

Author: Brian Paul <[email protected]>
Date:   Thu Dec 28 09:16:44 2017 -0700

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 <[email protected]>

---

 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 9bd0d5303b..11f36e3553 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;
             }
          }

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to