From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 10 Jan 2018 07:14:10 +0000 (-0800)
Subject: iris: don't segfault on !old_cso
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c1c6c3a18a61f59809a46451521a941d938fbe57;p=mesa.git

iris: don't segfault on !old_cso
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 66f33fc242b..842136fc00d 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -540,14 +540,16 @@ iris_bind_rasterizer_state(struct pipe_context *ctx, void *state)
    struct iris_rasterizer_state *old_cso = ice->state.cso_rast;
    struct iris_rasterizer_state *new_cso = state;
 
-   /* Avoid re-emitting 3DSTATE_LINE_STIPPLE if we can, it's non-pipelined */
-   if (old_cso->line_stipple_factor != new_cso->line_stipple_factor ||
-       old_cso->line_stipple_pattern != new_cso->line_stipple_pattern) {
-      ice->state.dirty |= IRIS_DIRTY_LINE_STIPPLE;
-   }
+   if (old_cso) {
+      /* Try to avoid re-emitting 3DSTATE_LINE_STIPPLE, it's non-pipelined */
+      if (old_cso->line_stipple_factor != new_cso->line_stipple_factor ||
+          old_cso->line_stipple_pattern != new_cso->line_stipple_pattern) {
+         ice->state.dirty |= IRIS_DIRTY_LINE_STIPPLE;
+      }
 
-   if (old_cso->half_pixel_center != new_cso->half_pixel_center) {
-      ice->state.dirty |= IRIS_DIRTY_MULTISAMPLE;
+      if (old_cso->half_pixel_center != new_cso->half_pixel_center) {
+         ice->state.dirty |= IRIS_DIRTY_MULTISAMPLE;
+      }
    }
 
    ice->state.cso_rast = new_cso;